diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java
index 2094bbc86..4fae8aaee 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java
@@ -53,6 +53,7 @@ public class OrderTemplate extends OrderLineGroupTemplate {
     public Order createElement() {
         Order order = Order.create();
         order.setInitDate(today());
+        order.setCalendar(calendar);
         return setupGroupParts(order);
     }
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
index 5cce27ed3..8e10af1c6 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
@@ -282,16 +282,20 @@ public class OrderModel implements IOrderModel {
         loadNeededDataForConversation();
         this.order = Order.create();
         initializeOrder();
+        initializeCalendar();
     }
 
     private void initializeOrder() {
         this.orderElementTreeModel = new OrderElementTreeModel(this.order);
         this.order.setInitDate(new Date());
-        this.order.setCalendar(getDefaultCalendar());
         setDefaultOrderCode();
         this.order.setCodeAutogenerated(true);
     }
 
+    private void initializeCalendar() {
+        this.order.setCalendar(getDefaultCalendar());
+    }
+
     @Override
     @Transactional(readOnly = true)
     public void prepareCreationFrom(OrderTemplate template) {