diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/daos/BaseCalendarDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/daos/BaseCalendarDAOTest.java
index 87aea15b0..7ae6849f9 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/daos/BaseCalendarDAOTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/calendars/daos/BaseCalendarDAOTest.java
@@ -247,45 +247,6 @@ public class BaseCalendarDAOTest {
         baseCalendarDAO.flush();
     }
 
-    @Test(expected = DataIntegrityViolationException.class)
-    public void notAllowTwoCalendarsWithTheSameName() {
-        BaseCalendar calendar1 = BaseCalendarTest.createBasicCalendar();
-        calendar1.setName("Test");
-        BaseCalendar calendar2 = BaseCalendarTest.createBasicCalendar();
-        calendar2.setName("Test");
-
-        assertThat(calendar2.getName(), equalTo(calendar1.getName()));
-        baseCalendarDAO.save(calendar1);
-        baseCalendarDAO.save(calendar2);
-        baseCalendarDAO.flush();
-    }
-
-    @Test
-    public void notAllowTwoCalendarsWithTheSameNameChangingCalendarName()
-            throws InstanceNotFoundException {
-        BaseCalendar calendar1 = BaseCalendarTest.createBasicCalendar();
-        calendar1.setName("Test");
-        BaseCalendar calendar2 = BaseCalendarTest.createBasicCalendar();
-        calendar2.setName("Test2");
-
-        baseCalendarDAO.save(calendar1);
-        baseCalendarDAO.save(calendar2);
-        baseCalendarDAO.flush();
-
-        calendar2 = baseCalendarDAO.find(calendar2.getId());
-        calendar2.setName("Test");
-
-        assertThat(calendar2.getName(), equalTo(calendar1.getName()));
-
-        try {
-            baseCalendarDAO.save(calendar2);
-            baseCalendarDAO.flush();
-            fail("It should throw an exception");
-        } catch (DataIntegrityViolationException e) {
-
-        }
-    }
-
     @Test
     public void findByName() {
         BaseCalendar calendar = BaseCalendarTest.createBasicCalendar();
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java
index 806ed06aa..39cb75e1d 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java
@@ -20,7 +20,10 @@
 
 package org.navalplanner.web.resources.criterion;
 
+import static org.navalplanner.web.I18nHelper._;
+
 import java.util.List;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.validator.InvalidValue;
@@ -34,10 +37,9 @@ import org.navalplanner.web.common.MessagesForUser;
 import org.navalplanner.web.common.OnlyOneVisible;
 import org.navalplanner.web.common.Util;
 import org.zkoss.zk.ui.Component;
-import org.zkoss.zul.Window;
 import org.zkoss.zk.ui.util.GenericForwardComposer;
 import org.zkoss.zul.Checkbox;
-import static org.navalplanner.web.I18nHelper._;
+import org.zkoss.zul.Window;
 
 /**
  * Controller for Criterions <br />
@@ -84,7 +86,7 @@ public class CriterionAdminController_V2 extends GenericForwardComposer {
 
     public void goToCreateForm() {
         try{
-            setupCriterionTreeController(editComponent);
+            setupCriterionTreeController(createComponent);
             onlyOneVisible.showOnly(createComponent);
             criterionsModel_V2.prepareForCreate();
             Util.reloadBindings(createComponent);