diff --git a/src/views/users.html b/src/views/users.html
index 7dc95a1bc..d6313680c 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -45,40 +45,39 @@
         <form name="useradd_form" role="form" ng-submit="useradd.submit()" autocomplete="off">
           <div class="form-group" ng-class="{ 'has-error': (useradd_form.displayName.$dirty && useradd_form.displayName.$invalid) || (!useradd_form.displayName.$dirty && useradd.error.displayName) }">
             <label class="control-label">{{ 'users.user.fullName' | tr }}</label>
+            <input type="text" class="form-control" ng-model="useradd.displayName" name="displayName" id="inputUserAddDisplayName" ng-required autofocus autocomplete="off">
             <div class="control-label" ng-show="(!useradd_form.displayName.$dirty && useradd.error.displayName) || (useradd_form.displayName.$dirty && useradd_form.displayName.$invalid) || (!useradd_form.displayName.$dirty && useradd.error.displayName)">
               <small ng-show="useradd_form.displayName.$error.displayName">{{ 'users.user.errorNotValidFullName' | tr }}</small>
               <small ng-show="!useradd_form.displayName.$dirty && useradd.error.displayName">{{ useradd.error.displayName }}</small>
             </div>
-            <input type="text" class="form-control" ng-model="useradd.displayName" name="displayName" id="inputUserAddDisplayName" ng-required autofocus autocomplete="off">
           </div>
 
           <input type="password" style="display: none;">
           <div class="form-group" ng-class="{ 'has-error': (useradd_form.email.$dirty && useradd_form.email.$invalid) || (!useradd_form.email.$dirty && useradd.error.email) }">
             <label class="control-label">{{ 'users.user.email' | tr }}</label>
+            <input type="email" class="form-control" ng-model="useradd.email" name="email" id="inputUserAddEmail" required>
             <div class="control-label" ng-show="(!useradd_form.email.$dirty && useradd.error.email) || (useradd_form.email.$dirty && useradd_form.email.$invalid) || (!useradd_form.email.$dirty && useradd.error.email)">
               <small ng-show="useradd_form.email.$error.required">{{ 'users.user.errorEmailRequired' | tr }}</small>
               <small ng-show="useradd_form.email.$error.email">{{ 'users.user.errorInvalidEmail' | tr }}</small>
               <small ng-show="!useradd_form.email.$dirty && useradd.error.email">{{ useradd.error.email }}</small>
             </div>
-            <input type="email" class="form-control" ng-model="useradd.email" name="email" id="inputUserAddEmail" required>
           </div>
 
           <div class="form-group" ng-class="{ 'has-error': (useradd_form.username.$dirty && useradd_form.username.$invalid) || (!useradd_form.username.$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" placeholder="{{ 'users.user.usernamePlaceholder' | tr }}">
             <div class="control-label" ng-show="(!useradd_form.username.$dirty && useradd.error.username) || (useradd_form.username.$dirty && useradd_form.username.$invalid) || (!useradd_form.username.$dirty && useradd.error.username)">
               <small ng-show="useradd_form.username.$error.username">{{ 'users.user.errorInvalidUsername' | tr }}</small>
               <small ng-show="!useradd_form.username.$dirty && useradd.error.username">{{ useradd.error.username }}</small>
             </div>
-            <input type="text" class="form-control" ng-model="useradd.username" name="username" id="inputUserAddUsername" placeholder="{{ 'users.user.usernamePlaceholder' | tr }}">
           </div>
 
           <div class="form-group" ng-show="useradd.username" ng-class="{ 'has-error': (useradd_form.password.$dirty && useradd_form.password.$invalid) || (!useradd_form.password.$dirty && useradd.error.password) }">
             <label class="control-label">{{ 'users.user.password' | tr }}</label>
+            <input type="password" class="form-control" ng-model="useradd.password" name="password" id="inputUserAddPassword" placeholder="{{ 'users.user.passwordPlaceholder' | tr }}">
             <div class="control-label" ng-show="(!useradd_form.password.$dirty && useradd.error.password) || (useradd_form.password.$dirty && useradd_form.password.$invalid) || (!useradd_form.password.$dirty && useradd.error.password)">
-              <small ng-show="useradd_form.password.$error.password">{{ 'users.user.errorInvalidPassword' | tr }}</small>
               <small ng-show="!useradd_form.password.$dirty && useradd.error.password">{{ useradd.error.password }}</small>
             </div>
-            <input type="password" class="form-control" ng-model="useradd.password" name="password" id="inputUserAddPassword" placeholder="{{ 'users.user.passwordPlaceholder' | tr }}">
           </div>
 
           <div class="form-group" ng-show="userInfo.isAtLeastAdmin">
diff --git a/src/views/users.js b/src/views/users.js
index e2a28f6bd..443d0a19b 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -197,6 +197,10 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
                             $scope.useradd.error.username = error.message;
                             $scope.useradd_form.username.$setPristine();
                             $('#inputUserAddUsername').focus();
+                        } else if (error.message.toLowerCase().indexOf('password') !== -1) {
+                            $scope.useradd.error.password = error.message;
+                            $scope.useradd_form.password.$setPristine();
+                            $('#inputUserAddPassword').focus();
                         } else {
                             console.error('Unable to create user.', error.statusCode, error.message);
                         }