diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
index 9e18fa94a..8336ada50 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
@@ -131,6 +131,14 @@ public class ConfigurationController extends GenericForwardComposer {
         configurationModel.setCompanyCode(companyCode);
     }
 
+    public Boolean getGenerateCodeForCriterion() {
+        return configurationModel.getGenerateCodeForCriterion();
+    }
+
+    public void setGenerateCodeForCriterion(Boolean generateCodeForCriterion) {
+        configurationModel.setGenerateCodeForCriterion(generateCodeForCriterion);
+    }
+
     public List<OrderSequence> getOrderSequences() {
         return configurationModel.getOrderSequences();
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java
index daee44147..b6fc45aab 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java
@@ -206,6 +206,21 @@ public class ConfigurationModel implements IConfigurationModel {
         }
     }
 
+    @Override
+    public Boolean getGenerateCodeForCriterion() {
+        if (configuration == null) {
+            return null;
+        }
+        return configuration.getGenerateCodeForCriterion();
+    }
+
+    @Override
+    public void setGenerateCodeForCriterion(Boolean generateCodeForCriterion) {
+        if (configuration != null) {
+            configuration.setGenerateCodeForCriterion(generateCodeForCriterion);
+        }
+    }
+
     @Override
     public List<OrderSequence> getOrderSequences() {
         return Collections.unmodifiableList(orderSequences);
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/IConfigurationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/IConfigurationModel.java
index 976c6b498..d7676e357 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/IConfigurationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/IConfigurationModel.java
@@ -51,6 +51,9 @@ public interface IConfigurationModel {
     String getCompanyCode();
     void setCompanyCode(String companyCode);
 
+    Boolean getGenerateCodeForCriterion();
+    void setGenerateCodeForCriterion(Boolean generateCodeForCriterion);
+
     List<OrderSequence> getOrderSequences();
     void addOrderSequence();
     void removeOrderSequence(OrderSequence orderSequence)
diff --git a/navalplanner-webapp/src/main/webapp/common/configuration.zul b/navalplanner-webapp/src/main/webapp/common/configuration.zul
index 23be2f2be..922bfa1d3 100644
--- a/navalplanner-webapp/src/main/webapp/common/configuration.zul
+++ b/navalplanner-webapp/src/main/webapp/common/configuration.zul
@@ -61,6 +61,10 @@
                                 model="@{configurationController.calendars}"
                                 selectedElement="@{configurationController.defaultCalendar}" />
                         </row>
+                        <row>
+                            <label value="${i18n:_('Generate code for Criterion')}" />
+                            <checkbox checked="@{configurationController.generateCodeForCriterion}" />
+                        </row>
                     </rows>
                 </grid>