diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java
index 74cc3379b..67ae72fc6 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java
@@ -48,6 +48,8 @@ import org.zkoss.zul.Label;
 import org.zkoss.zul.Messagebox;
 import org.zkoss.zul.Row;
 import org.zkoss.zul.RowRenderer;
+import org.zkoss.zul.Textbox;
+import org.zkoss.zul.impl.InputElement;
 
 /**
  * Controller for CRUD actions over a {@link AdvanceType}
@@ -165,14 +167,34 @@ public class AdvanceTypeCRUDController extends GenericForwardComposer {
     }
 
     private boolean save() {
-        try {
-            advanceTypeModel.save();
-            messagesForUser.showMessage(Level.INFO, _("Progress type saved"));
-            return true;
-        } catch (ValidationException e) {
-            messagesForUser.showInvalidValues(e);
-            return false;
+        if (isAllValid()) {
+            try {
+                advanceTypeModel.save();
+                messagesForUser.showMessage(Level.INFO,
+                        _("Progress type saved"));
+                return true;
+            } catch (ValidationException e) {
+                messagesForUser.showInvalidValues(e);
+                return false;
+            }
         }
+        return false;
+    }
+
+    private boolean isAllValid() {
+        Component window = this.getCurrentWindow();
+        Textbox unitName = (Textbox) window.getFellowIfAny("unitName");
+        InputElement defaultMaxValue = (InputElement) window
+                .getFellowIfAny("defaultMaxValue");
+        InputElement precision = (InputElement) window
+                .getFellowIfAny("precision");
+        unitName.setFocus(true);
+        return (isValid(unitName) && isValid(precision) && isValid(defaultMaxValue));
+    }
+
+    private boolean isValid(InputElement inputtext) {
+        inputtext.setFocus(true);
+        return inputtext.isValid();
     }
 
     public void confirmRemove(AdvanceType advanceType) {
diff --git a/navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul b/navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul
index 7ca27a847..3a8539ff0 100644
--- a/navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul
@@ -35,7 +35,7 @@
                     <rows>
                         <row>
                             <label value="${i18n:_('Unit name')}" />
-                            <textbox value="@{controller.advanceType.unitName}" constraint="@{controller.distinctNames}" width="300px"
+                            <textbox id="unitName" value="@{controller.advanceType.unitName}" constraint="@{controller.distinctNames}" width="300px"
                                 disabled="@{controller.immutable}" />
                         </row>
                         <row>