diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/HoursGroupOrderLineTemplateHandler.java b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/HoursGroupOrderLineTemplateHandler.java
index ffae9313f..e2d9e7d36 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/HoursGroupOrderLineTemplateHandler.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/HoursGroupOrderLineTemplateHandler.java
@@ -21,6 +21,7 @@
 package org.navalplanner.business.templates.entities;
 
 import java.util.Set;
+import java.util.UUID;
 
 import org.navalplanner.business.orders.entities.HoursGroup;
 import org.navalplanner.business.orders.entities.HoursGroupHandler;
@@ -45,7 +46,9 @@ public class HoursGroupOrderLineTemplateHandler extends HoursGroupHandler<OrderL
 
     @Override
     protected HoursGroup createHoursGroup(OrderLineTemplate orderLine) {
-        return HoursGroup.create(orderLine);
+        HoursGroup result = HoursGroup.create(orderLine);
+        result.setCode(UUID.randomUUID().toString());
+        return result;
     }
 
     @Override
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java
index c655afa77..9e088e571 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/TemplatesTree.java
@@ -55,11 +55,11 @@ public class TemplatesTree extends EntitiesTree<OrderElementTemplate> {
 
     @Override
     protected OrderElementTemplate createNewElement(String name, int hours) {
-        // Pending to set proper hours parameter
         OrderLineTemplate result = OrderLineTemplate.createNew();
         result.setName(name);
         result.setCode(_("New code"));
         result.setDescription(_("New Description"));
+        result.setWorkHours(hours);
         return result;
     }