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 6808c81fd..84cd0812a 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
@@ -762,7 +762,4 @@ public class ConfigurationController extends GenericForwardComposer {
         return configurationModel.isChangedDefaultPasswdAdmin();
     }
 
-    public String getTooltiptextAutocompleteLogin() {
-        return _("disable/enable autocomplete property in form login, if the admin password is still in  default.");
-    }
 }
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/webapp/common/configuration.zul b/navalplanner-webapp/src/main/webapp/common/configuration.zul
index fe9969a7e..81786eb9c 100644
--- a/navalplanner-webapp/src/main/webapp/common/configuration.zul
+++ b/navalplanner-webapp/src/main/webapp/common/configuration.zul
@@ -72,6 +72,15 @@
                                 <textbox id="companyLogoURL"
                                     value="@{configurationController.companyLogoURL}" width="300px"/>
                             </row>
+                            <row>
+                                <label value="${i18n:_('Autocomplete login form')}" />
+                                <checkbox id="enableAutocompleteLogin"
+                                    label="${i18n:_('Enable/Disable')}"
+                                    disabled="@{configurationController.isChangedDefaultPasswdAdmin}"
+                                    tooltiptext = "${i18n:_('Enable/Disable autocomplete property in login form, if the admin password is still in default')}"
+                                    checked="@{configurationController.autocompleteLogin}"
+                                    onCheck="configurationController.reloadGeneralConfiguration();" />
+                            </row>
                             <row>
                                 <label value="${i18n:_('Generate code for')}" />
                                 <grid>
@@ -181,12 +190,6 @@
                                             <checkbox
                                                 label="${i18n:_('MonteCarlo method')}"
                                                 checked="@{configurationController.monteCarloMethodTabVisible}" />
-                                            <checkbox id="enableAutocompleteLogin"
-                                                label="${i18n:_('enable autocomplete login')}"
-                                                disabled="@{configurationController.isChangedDefaultPasswdAdmin}"
-                                                tooltiptext = "@{configurationController.tooltiptextAutocompleteLogin}"
-                                                checked="@{configurationController.autocompleteLogin}"
-                                                onCheck="configurationController.reloadGeneralConfiguration();" />
                                         </row>
                                         <row>
                                             <checkbox id="scenariosVisible"