diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/QualityForm.java b/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/QualityForm.java
index dd261f38d..7f84c4024 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/QualityForm.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/QualityForm.java
@@ -103,9 +103,9 @@ public class QualityForm extends BaseEntity {
         this.qualityFormItems = qualityFormItems;
     }
 
-    public boolean addQualityFormItemAtEnd(QualityFormItem qualityFormItem) {
+    public boolean addQualityFormItemOnTop(QualityFormItem qualityFormItem) {
         if (qualityFormItem != null) {
-            Integer position = this.qualityFormItems.size();
+            Integer position = 0;
             qualityFormItem.setPosition(position);
             qualityFormItems.add(qualityFormItem);
             updateAndSortQualityFormItemPositions();
@@ -143,7 +143,7 @@ public class QualityForm extends BaseEntity {
     }
 
     @SuppressWarnings("unused")
-    @AssertTrue(message = "The quality item positions must be uniques, consecutives.")
+    @AssertTrue(message = "The quality item positions must be unique and consecutive.")
     public boolean checkConstraintConsecutivesAndUniquesQualityFormItemPositions() {
         List<QualityFormItem> result = getListToNull(qualityFormItems);
         for (QualityFormItem qualityFormItem : qualityFormItems) {
@@ -175,7 +175,7 @@ public class QualityForm extends BaseEntity {
     }
 
     @SuppressWarnings("unused")
-    @AssertTrue(message = "The quality item positions must be corrects in function to the percentage.")
+    @AssertTrue(message = "The quality item positions must be correct in function to the percentage.")
     public boolean checkConstraintCorrectPositionsQualityFormItemsByPercentage() {
         // check the position is correct in function to the percentage.
         if ((qualityFormType != null)
@@ -191,7 +191,7 @@ public class QualityForm extends BaseEntity {
     }
 
     @SuppressWarnings("unused")
-    @AssertTrue(message = "The quality form item porcentage must be uniques if the quality form type is by percentage.")
+    @AssertTrue(message = "The quality form item porcentage must be unique if the quality form type is by percentage.")
     public boolean checkConstraintDuplicatesQualityFormItemPercentage() {
         if ((qualityFormType != null)
                 && (qualityFormType.equals(QualityFormType.BY_PERCENTAGE))
@@ -207,10 +207,9 @@ public class QualityForm extends BaseEntity {
             if (itemToFind.getPercentage() == null) {
                 return null;
             }
-            if ((!itemToFind.equals(item))
-                    && (item.getPercentage() != null)
-                    && (itemToFind.getPercentage().compareTo(item
-                            .getPercentage())) > 0) {
+            if ((((!itemToFind.equals(item)) && (item.getPercentage() != null) && (itemToFind
+                    .getPercentage().compareTo(item.getPercentage())) > 0))
+                    || (item.getPercentage() == null)) {
                 position++;
             }
         }
@@ -235,8 +234,8 @@ public class QualityForm extends BaseEntity {
 
                 Integer position = getCorrectPosition(item);
                 if (position == null) {
+                    position = nulos;
                     nulos++;
-                    position = qualityFormItems.size() - nulos;
                 }
 
                 while (result.get(position) != null) {
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/qualityforms/daos/QualityFormDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/qualityforms/daos/QualityFormDAOTest.java
index 94882e956..682641b9e 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/qualityforms/daos/QualityFormDAOTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/qualityforms/daos/QualityFormDAOTest.java
@@ -89,7 +89,7 @@ public class QualityFormDAOTest extends AbstractQualityFormTest {
     public void testSaveQualityFormItems() {
         QualityForm qualityForm = createValidQualityForm();
         QualityFormItem qualityFormItem = createValidQualityFormItem();
-        qualityForm.addQualityFormItemAtEnd(qualityFormItem);
+        qualityForm.addQualityFormItemOnTop(qualityFormItem);
         qualityFormDAO.save(qualityForm);
 
         assertTrue(qualityForm.getId() != null);
@@ -101,7 +101,7 @@ public class QualityFormDAOTest extends AbstractQualityFormTest {
             throws InstanceNotFoundException {
         QualityForm qualityForm = createValidQualityForm();
         QualityFormItem qualityFormItem = createValidQualityFormItem();
-        qualityForm.addQualityFormItemAtEnd(qualityFormItem);
+        qualityForm.addQualityFormItemOnTop(qualityFormItem);
         qualityFormDAO.save(qualityForm);
 
         assertTrue(qualityForm.getId() != null);
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/qualityforms/entities/QualityFormTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/qualityforms/entities/QualityFormTest.java
index 0304bc8d8..f4f28855f 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/qualityforms/entities/QualityFormTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/qualityforms/entities/QualityFormTest.java
@@ -89,10 +89,10 @@ public class QualityFormTest extends AbstractQualityFormTest {
         QualityForm qualityForm = createValidQualityForm();
 
         QualityFormItem qualityFormItem1 = createValidQualityFormItem();
-        qualityForm.addQualityFormItemAtEnd(qualityFormItem1);
+        qualityForm.addQualityFormItemOnTop(qualityFormItem1);
 
         QualityFormItem qualityFormItem2 = createValidQualityFormItem();
-        qualityForm.addQualityFormItemAtEnd(qualityFormItem2);
+        qualityForm.addQualityFormItemOnTop(qualityFormItem2);
 
         qualityFormItem1.setPosition(0);
         qualityFormItem2.setPosition(0);
@@ -112,10 +112,10 @@ public class QualityFormTest extends AbstractQualityFormTest {
         QualityForm qualityForm = createValidQualityForm();
 
         QualityFormItem qualityFormItem1 = createValidQualityFormItem();
-        qualityForm.addQualityFormItemAtEnd(qualityFormItem1);
+        qualityForm.addQualityFormItemOnTop(qualityFormItem1);
 
         QualityFormItem qualityFormItem2 = createValidQualityFormItem();
-        qualityForm.addQualityFormItemAtEnd(qualityFormItem2);
+        qualityForm.addQualityFormItemOnTop(qualityFormItem2);
 
         qualityFormItem1.setPosition(0);
         qualityFormItem2.setPosition(2);
@@ -135,10 +135,10 @@ public class QualityFormTest extends AbstractQualityFormTest {
         QualityForm qualityForm = createValidQualityForm();
 
         QualityFormItem qualityFormItem1 = createValidQualityFormItem();
-        qualityForm.addQualityFormItemAtEnd(qualityFormItem1);
+        qualityForm.addQualityFormItemOnTop(qualityFormItem1);
 
         QualityFormItem qualityFormItem2 = createValidQualityFormItem();
-        qualityForm.addQualityFormItemAtEnd(qualityFormItem2);
+        qualityForm.addQualityFormItemOnTop(qualityFormItem2);
 
         qualityFormItem1.setPosition(1);
         qualityFormItem2.setPosition(2);
@@ -159,10 +159,10 @@ public class QualityFormTest extends AbstractQualityFormTest {
         QualityForm qualityForm = createValidQualityForm();
 
         QualityFormItem qualityFormItem1 = createValidQualityFormItem();
-        qualityForm.addQualityFormItemAtEnd(qualityFormItem1);
+        qualityForm.addQualityFormItemOnTop(qualityFormItem1);
 
         QualityFormItem qualityFormItem2 = createValidQualityFormItem();
-        qualityForm.addQualityFormItemAtEnd(qualityFormItem2);
+        qualityForm.addQualityFormItemOnTop(qualityFormItem2);
 
         qualityFormItem1.setPosition(0);
         qualityFormItem1.setPercentage(new BigDecimal(1));
@@ -190,7 +190,7 @@ public class QualityFormTest extends AbstractQualityFormTest {
     public void checkInvalidQualityFormItemName() throws ValidationException {
         QualityForm qualityForm = createValidQualityForm();
         QualityFormItem qualityFormItem = createValidQualityFormItem();
-        qualityForm.addQualityFormItemAtEnd(qualityFormItem);
+        qualityForm.addQualityFormItemOnTop(qualityFormItem);
         try {
             qualityFormDAO.save(qualityForm);
         } catch (ValidationException e) {
@@ -219,7 +219,7 @@ public class QualityFormTest extends AbstractQualityFormTest {
             throws ValidationException {
         QualityForm qualityForm = createValidQualityForm();
         QualityFormItem qualityFormItem = createValidQualityFormItem();
-        qualityForm.addQualityFormItemAtEnd(qualityFormItem);
+        qualityForm.addQualityFormItemOnTop(qualityFormItem);
         qualityFormItem.setPosition(null);
         try {
             qualityFormDAO.save(qualityForm);
@@ -237,7 +237,7 @@ public class QualityFormTest extends AbstractQualityFormTest {
         QualityForm qualityForm = createValidQualityForm();
         QualityFormItem qualityFormItem = createValidQualityFormItem();
         qualityFormItem.setPercentage(null);
-        qualityForm.addQualityFormItemAtEnd(qualityFormItem);
+        qualityForm.addQualityFormItemOnTop(qualityFormItem);
         try {
             qualityFormDAO.save(qualityForm);
             fail("It should throw an exception");
@@ -252,7 +252,7 @@ public class QualityFormTest extends AbstractQualityFormTest {
         QualityForm qualityForm = createValidQualityForm();
         QualityFormItem qualityFormItem = createValidQualityFormItem();
         qualityFormItem.setPercentage(new BigDecimal(100.1));
-        qualityForm.addQualityFormItemAtEnd(qualityFormItem);
+        qualityForm.addQualityFormItemOnTop(qualityFormItem);
         try {
             qualityFormDAO.save(qualityForm);
             fail("It should throw an exception");
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java
index 7413dce04..818e79b0c 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java
@@ -296,7 +296,6 @@ public class QualityFormCRUDController extends GenericForwardComposer {
     }
 
     public void createQualityFormItem() {
-        // validate();
         qualityFormModel.addQualityFormItem();
         Util.reloadBindings(gridQualityFormItems);
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormModel.java
index ac740d1d8..37f6dad5b 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormModel.java
@@ -124,7 +124,7 @@ public class QualityFormModel implements IQualityFormModel {
     @Override
     public void addQualityFormItem() {
         QualityFormItem item = QualityFormItem.create();
-        qualityForm.addQualityFormItemAtEnd(item);
+        qualityForm.addQualityFormItemOnTop(item);
     }
 
     @Override