diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java
index aa88ce8ed..9d3cea66f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java
@@ -178,9 +178,21 @@ public class CriterionTreeController extends GenericForwardComposer {
             // Treecell with the code of the Criterion
             Treecell cellForCode = new Treecell();
             cellForCode.setStyle("center");
-            Label codeLabel = new Label();
-            codeLabel.setValue(criterionForThisRow.getCriterion().getCode());
-            cellForCode.appendChild(codeLabel);
+            Textbox codeLabel = new Textbox();
+            cellForCode.appendChild(Util.bind(codeLabel,
+                    new Util.Getter<String>() {
+
+                @Override
+                public String get() {
+                    return criterionForThisRow.getCriterion().getCode();
+                }
+            }, new Util.Setter<String>() {
+
+                @Override
+                public void set(String value) {
+                    criterionForThisRow.getCriterion().setCode(value);
+                }
+            }));
 
             cellForName.setParent(tr);
             cellForCode.setParent(tr);
diff --git a/navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul
index 64475bfc4..6acff7ede 100644
--- a/navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul
@@ -62,7 +62,8 @@
                         </row>
                         <row>
                             <label value="${i18n:_('Code')}" />
-                            <label value="@{controller.criterionType.code}"/>
+                            <textbox value="@{controller.criterionType.code}" width="390px"
+                                constraint="no empty:${i18n:_('cannot be null or empty')}" />
                         </row>
                     </rows>
                 </grid>