diff --git a/src/views/users.html b/src/views/users.html
index 276b95508..2e73d75f1 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -52,7 +52,6 @@
             </div>
           </div>
 
-          <input type="password" style="display: none;">
           <div class="form-group" ng-class="{ 'has-error': (useraddForm.email.$dirty && useraddForm.email.$invalid) || (!useraddForm.email.$dirty && useradd.error.email) }">
             <label class="control-label">{{ 'users.user.primaryEmail' | tr }}</label>
             <input type="email" class="form-control" ng-model="useradd.email" name="email" id="inputUserAddEmail" required>
@@ -73,12 +72,12 @@
             </div>
           </div>
 
-          <div class="form-group" ng-class="{ 'has-error': (useraddForm.username.$dirty && useraddForm.username.$invalid) || (!useraddForm.username.$dirty && useradd.error.username) }">
+          <div class="form-group" ng-class="{ 'has-error': (useraddForm.newUsername.$dirty && useraddForm.newUsername.$invalid) || (!useraddForm.newUsername.$dirty && useradd.error.username) }">
             <label class="control-label">{{ 'users.user.username' | tr }}</label>
-            <input type="text" class="form-control" ng-model="useradd.username" name="username" id="inputUserAddUsername" ng-required="config.profileLocked" placeholder="{{ config.profileLocked ? '' : ('users.user.usernamePlaceholder' | tr) }}">
-            <div class="control-label" ng-show="(!useraddForm.username.$dirty && useradd.error.username) || (useraddForm.username.$dirty && useraddForm.username.$invalid) || (!useraddForm.username.$dirty && useradd.error.username)">
-              <small ng-show="useraddForm.username.$error.username">{{ 'users.user.errorInvalidUsername' | tr }}</small>
-              <small ng-show="!useraddForm.username.$dirty && useradd.error.username">{{ useradd.error.username }}</small>
+            <input type="text" class="form-control" ng-model="useradd.username" name="newUsername" id="inputUserAddUsername" ng-required="config.profileLocked" placeholder="{{ config.profileLocked ? '' : ('users.user.usernamePlaceholder' | tr) }}">
+            <div class="control-label" ng-show="(!useraddForm.newUsername.$dirty && useradd.error.username) || (useraddForm.newUsername.$dirty && useraddForm.newUsername.$invalid) || (!useraddForm.newUsername.$dirty && useradd.error.username)">
+              <small ng-show="useraddForm.newUsername.$error.username">{{ 'users.user.errorInvalidUsername' | tr }}</small>
+              <small ng-show="!useraddForm.newUsername.$dirty && useradd.error.username">{{ useradd.error.username }}</small>
             </div>
           </div>
 
@@ -469,7 +468,7 @@
               <small ng-show="setGhost.error">{{ setGhost.error }}</small>
             </div>
             <div class="input-group">
-              <input type="text" id="setGhostPassword" class="form-control" name="password" ng-model="setGhost.password" required ng-readonly="setGhost.success"/>
+              <input type="text" id="setGhostPassword" class="form-control" name="ghostPassword" ng-model="setGhost.password" required ng-readonly="setGhost.success"/>
               <span class="input-group-btn">
                 <button class="btn btn-default" ng-hide="setGhost.success" type="button" uib-tooltip="{{ 'users.setGhostDialog.generatePassword' | tr }}Generate Password" ng-click="setGhost.generatePassword()"><i class="fa fa-key"></i></button>
                 <button class="btn btn-default" ng-show="setGhost.success" type="button" id="setGhostClipboardButton" data-clipboard-target="#setGhostPassword"><i class="fa fa-clipboard"></i></button>
@@ -506,9 +505,6 @@
         <div uib-collapse="externalLdap.provider === 'noop'">
           <form name="externalLdapConfigForm" role="form" novalidate ng-submit="externalLdap.submit()" autocomplete="off">
             <fieldset>
-              <!-- avoid browsers to attempt an autofill for bindDN/bindPassword -->
-              <input type="password" style="display: none;">
-
               <div class="form-group" ng-class="{ 'has-error': externalLdap.error.url }">
                 <label class="control-label" for="inputExternalLdapConfigUrl">{{ 'users.externalLdap.server' | tr }}</label>
                 <input type="text" class="form-control" ng-model="externalLdap.url" id="inputExternalLdapConfigUrl" name="url" ng-disabled="externalLdap.busy" placeholder="ldaps://example.com:636" required>
@@ -956,7 +952,7 @@
             <div class="form-group">
               <label class="control-label">{{ 'users.exposedLdap.secret.label' | tr }}</label>
               <p class="small" ng-bind-html=" 'users.exposedLdap.secret.description' | tr:{ userDN: 'cn=admin,ou=system,dc=cloudron' }"></p>
-              <input type="password" ng-model="userDirectoryConfig.secret" ng-disabled="!userDirectoryConfig.enabled || userDirectoryConfig.busy" name="secret" class="form-control" ng-class="{ 'has-error': !userDirectoryConfigForm.secret.$dirty && userDirectoryConfig.error.secret }" password-reveal/>
+              <input type="password" ng-model="userDirectoryConfig.secret" ng-disabled="!userDirectoryConfig.enabled || userDirectoryConfig.busy" name="userDirectorySecret" class="form-control" ng-class="{ 'has-error': !userDirectoryConfigForm.secret.$dirty && userDirectoryConfig.error.secret }" password-reveal/>
               <div class="has-error" ng-show="userDirectoryConfig.error.secret">{{ userDirectoryConfig.error.secret }}</div>
             </div>
             <div class="form-group">