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 e09c6fee5..4cb08475d 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
@@ -392,15 +392,18 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
                 Order.create());
         planningState.getOrder().setInitDate(new Date());
         initializeOrder();
+        initializeCode();
         initializeCalendar();
     }
 
     private void initializeOrder() {
-        Order order = planningState.getOrder();
         this.orderElementTreeModel = new OrderElementTreeModel(
-                order);
+                planningState.getOrder());
+    }
+
+    private void initializeCode() {
         setDefaultCode();
-        order.setCodeAutogenerated(true);
+        planningState.getOrder().setCodeAutogenerated(true);
     }
 
     private void initializeCalendar() {
@@ -414,6 +417,9 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
         Order newOrder = createOrderFrom((OrderTemplate) templateDAO
                 .findExistingEntity(template.getId()));
 
+        newOrder.setCode(getOrder().getCode());
+        newOrder.setCodeAutogenerated(true);
+
         newOrder.setName(getOrder().getName());
         newOrder.setCustomer(((Order) getOrder()).getCustomer());
         newOrder.setCalendar(getCalendar());
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java
index 31f202449..bf24d5ff0 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/ProjectDetailsController.java
@@ -286,7 +286,9 @@ public class ProjectDetailsController extends GenericForwardComposer {
             generateCode.setDisabled(false);
             generateCode.setTooltiptext("");
         } else {
-            setCodeAutogenerated(true);
+            if (!isCodeAutogenerated()) {
+                setCodeAutogenerated(true);
+            }
             generateCode.setDisabled(true);
             generateCode
                     .setTooltiptext(_("Set Code as autogenerated to create a new project from templates"));