diff --git a/libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderTemplate.java b/libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderTemplate.java
index 3789fbef3..475fec24d 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderTemplate.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderTemplate.java
@@ -58,16 +58,11 @@ public class OrderTemplate extends OrderLineGroupTemplate {
         order.setVersionForScenario(currentScenario, OrderVersion
                 .createInitialVersion(currentScenario));
         order.useSchedulingDataFor(currentScenario);
-        order.setInitDate(today());
         order.setCalendar(calendar);
         order.initializeTemplate(this);
         return setupGroupParts(setupSchedulingStateType(order));
     }
 
-    private Date today() {
-        return new LocalDate().toDateTimeAtStartOfDay().toDate();
-    }
-
     @Override
     public String getType() {
         return _("Project");
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
index 136897c8e..a1bef0bdf 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
@@ -377,6 +377,7 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
         loadNeededDataForConversation();
         this.planningState = planningStateCreator.createOn(desktop,
                 Order.create());
+        planningState.getOrder().setInitDate(new Date());
         initializeOrder();
         initializeCalendar();
     }
@@ -385,7 +386,6 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
         Order order = planningState.getOrder();
         this.orderElementTreeModel = new OrderElementTreeModel(
                 order);
-        order.setInitDate(new Date());
         setDefaultCode();
         order.setCodeAutogenerated(true);
     }
@@ -400,16 +400,15 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
         loadNeededDataForConversation();
         Order newOrder = createOrderFrom((OrderTemplate) templateDAO
                 .findExistingEntity(template.getId()));
+
         newOrder.setName(getOrder().getName());
-        if (!getOrder().isCodeAutogenerated()) {
-            newOrder.setCodeAutogenerated();
-            newOrder.setCode(getOrder().getCode());
-        }
+        newOrder.setCustomer(((Order) getOrder()).getCustomer());
+        newOrder.setCalendar(getCalendar());
+
+        newOrder.setInitDate(getOrder().getInitDate());
         if (getOrder().getDeadline() != null) {
             newOrder.setDeadline(getOrder().getDeadline());
         }
-        newOrder.setCustomer(((Order) getOrder()).getCustomer());
-        newOrder.setCalendar(getCalendar());
 
         planningState = planningStateCreator.createOn(desktop, newOrder);
         forceLoadAdvanceAssignmentsAndMeasurements(planningState.getOrder());