diff --git a/webadmin/src/views/account.html b/webadmin/src/views/account.html
index 2692b4094..e69be9cde 100644
--- a/webadmin/src/views/account.html
+++ b/webadmin/src/views/account.html
@@ -8,34 +8,35 @@
             <div class="modal-body">
                 <form name="passwordchange_form" class="form-signin" role="form" novalidate ng-submit="doChangePassword(passwordchange_form)" autocomplete="off">
                     <fieldset>
-                        <div class="form-group" ng-class="{ 'has-error': (passwordchange_form.password.$dirty && passwordchange_form.password.$invalid)}">
+                        <div class="form-group" ng-class="{ 'has-error': (!passwordchange_form.password.$dirty && passwordchange.error.password) || (passwordchange_form.password.$dirty && passwordchange_form.password.$invalid) }">
                             <label class="control-label" for="inputPasswordChangePassword">Current Password</label>
                             <div class="control-label" ng-show="(!passwordchange_form.password.$dirty && passwordchange.error.password) || (passwordchange_form.password.$dirty && passwordchange_form.password.$invalid)">
-                                <small ng-show="passwordchange_form.password.$error.required">A password is required</small>
+                                <small ng-show="!passwordchange_form.password.$dirty && passwordchange.error.password">Invalid pasword</small>
+                                <small ng-show="passwordchange_form.password.$dirty && passwordchange_form.password.$error.required">A password is required</small>
                                 <small ng-show="passwordchange_form.password.$error.minlength">The password is too short</small>
                                 <small ng-show="passwordchange_form.password.$error.maxlength">The password is too long</small>
-                                <small ng-show="passwordchange_form.password.$dirty && passwordchange.error.password">Invalid pasword</small>
                             </div>
                             <input type="password" class="form-control" ng-model="passwordchange.password" id="inputPasswordChangePassword" name="password" ng-maxlength="512" ng-minlength="5" required autofocus>
                         </div>
-                        <div class="form-group" ng-class="{ 'has-error': (passwordchange_form.newPassword.$dirty && passwordchange_form.newPassword.$invalid)}">
-                            <label class="control-label" for="inputnewpassword">New Password</label>
+                        <div class="form-group" ng-class="{ 'has-error': (!passwordchange_form.newPassword.$dirty && passwordchange.error.newPassword) || (passwordchange_form.newPassword.$dirty && passwordchange_form.newPassword.$invalid) }">
+                            <label class="control-label" for="inputPasswordChangeNewPassword">New Password</label>
                             <div class="control-label" ng-show="(!passwordchange_form.newPassword.$dirty && passwordchange.error.newPassword) || (passwordchange_form.newPassword.$dirty && passwordchange_form.newPassword.$invalid)">
-                                <small ng-show="passwordchange_form.newPassword.$error.required">A password is required</small>
+                                <small ng-show="passwordchange.error.newPassword">{{ passwordchange.error.newPassword }}<br/><br/></small>
+                                <small ng-show="passwordchange_form.newPassword.$dirty && passwordchange_form.newPassword.$error.required">A password is required</small>
                                 <small ng-show="passwordchange_form.newPassword.$error.minlength">The password is too short</small>
                                 <small ng-show="passwordchange_form.newPassword.$error.maxlength">The password is too long</small>
                             </div>
-                            <input type="password" class="form-control" ng-model="passwordchange.newPassword" id="inputnewpassword" name="newPassword" ng-maxlength="512" ng-minlength="5" required autofocus>
+                            <input type="password" class="form-control" ng-model="passwordchange.newPassword" id="inputPasswordChangeNewPassword" name="newPassword" ng-maxlength="512" ng-minlength="5" required autofocus>
                         </div>
-                        <div class="form-group" ng-class="{ 'has-error': (passwordchange_form.newPasswordRepeat.$dirty && passwordchange_form.newPasswordRepeat.$invalid) || (passwordchange_form.newPasswordRepeat.$dirty && passwordchange.newPassword !== passwordchange.newPasswordRepeat) }">
-                            <label class="control-label" for="inputnewpasswordrepeat">Repeat New Password</label>
-                            <div class="control-label" ng-show="(!passwordchange_form.newPasswordRepeat.$dirty && passwordchange.error.newPasswordRepeat) || (passwordchange_form.newPasswordRepeat.$dirty && passwordchange_form.newPasswordRepeat.$invalid) || (passwordchange_form.newPasswordRepeat.$dirty && passwordchange.newPassword !== passwordchange.newPasswordRepeat)">
-                                <small ng-show="passwordchange_form.newPasswordRepeat.$error.required">A password is required</small>
+                        <div class="form-group" ng-class="{ 'has-error': (!passwordchange_form.newPassword.$dirty && passwordchange.error.newPassword) || (!passwordchange_form.newPasswordRepeat.$dirty && passwordchange.error.newPasswordRepeat) || (passwordchange_form.newPasswordRepeat.$dirty && passwordchange_form.newPasswordRepeat.$invalid) || (passwordchange_form.newPasswordRepeat.$dirty && passwordchange.newPassword !== passwordchange.newPasswordRepeat) }">
+                            <label class="control-label" for="inputPasswordChangeNewPasswordRepeat">Repeat New Password</label>
+                            <div class="control-label" ng-show="(!passwordchange_form.newPassword.$dirty && passwordchange.error.newPassword) || (!passwordchange_form.newPasswordRepeat.$dirty && passwordchange.error.newPasswordRepeat) || (passwordchange_form.newPasswordRepeat.$dirty && passwordchange_form.newPasswordRepeat.$invalid) || (passwordchange_form.newPasswordRepeat.$dirty && passwordchange.newPassword !== passwordchange.newPasswordRepeat)">
+                                <small ng-show="passwordchange_form.newPasswordRepeat.$dirty && passwordchange_form.newPasswordRepeat.$error.required">A password is required</small>
                                 <small ng-show="passwordchange_form.newPasswordRepeat.$error.minlength">The password is too short</small>
                                 <small ng-show="passwordchange_form.newPasswordRepeat.$error.maxlength">The password is too long</small>
                                 <small ng-show="passwordchange_form.newPasswordRepeat.$dirty && passwordchange.newPassword !== passwordchange.newPasswordRepeat">Passwords don't match</small>
                             </div>
-                            <input type="password" class="form-control" ng-model="passwordchange.newPasswordRepeat" id="inputnewpasswordrepeat" name="newPasswordRepeat" ng-maxlength="512" ng-minlength="5" required autofocus>
+                            <input type="password" class="form-control" ng-model="passwordchange.newPasswordRepeat" id="inputPasswordChangeNewPasswordRepeat" name="newPasswordRepeat" ng-maxlength="512" ng-minlength="5" required autofocus>
                         </div>
                         <input class="ng-hide" type="submit" ng-disabled="passwordchange_form.$invalid"/>
                     </fieldset>
diff --git a/webadmin/src/views/account.js b/webadmin/src/views/account.js
index d1e4177c3..9ce7c931d 100644
--- a/webadmin/src/views/account.js
+++ b/webadmin/src/views/account.js
@@ -60,6 +60,14 @@ angular.module('Application').controller('AccountController', ['$scope', '$locat
                     $scope.passwordchange.error.password = true;
                     $scope.passwordchange.password = '';
                     $('#inputPasswordChangePassword').focus();
+                    $scope.passwordchange_form.password.$setPristine();
+                } else if (error.statusCode === 400) {
+                    $scope.passwordchange.error.newPassword = error.message;
+                    $scope.passwordchange.newPassword = '';
+                    $scope.passwordchange.newPasswordRepeat = '';
+                    $scope.passwordchange_form.newPassword.$setPristine();
+                    $scope.passwordchange_form.newPasswordRepeat.$setPristine();
+                    $('#inputPasswordChangeNewPassword').focus();
                 } else {
                     console.error('Unable to change password.', error);
                 }