diff --git a/webadmin/src/views/settings.html b/webadmin/src/views/settings.html
index b0457ff44..5e587c2ef 100644
--- a/webadmin/src/views/settings.html
+++ b/webadmin/src/views/settings.html
@@ -9,15 +9,13 @@
             <div class="modal-body">
                 <form name="developerModeChangeForm" class="form-signin" role="form" novalidate ng-submit="doChangeDeveloperMode(developerModeChangeForm)" autocomplete="off">
                     <fieldset>
-                        <div class="form-group" ng-class="{ 'has-error': (developerModeChangeForm.password.$dirty && developerModeChangeForm.password.$invalid)}">
+                        <div class="form-group" ng-class="{ 'has-error': (!developerModeChangeForm.password.$dirty && developerModeChange.error.password) || (developerModeChangeForm.password.$dirty && developerModeChangeForm.password.$invalid) }">
                             <label class="control-label" for="inputDeveloperModeChangePassword">Give your password to verify that you are performing that action</label>
                             <div class="control-label" ng-show="(!developerModeChangeForm.password.$dirty && developerModeChange.error.password) || (developerModeChangeForm.password.$dirty && developerModeChangeForm.password.$invalid)">
-                                <small ng-show="developerModeChangeForm.password.$error.required">A password is required</small>
-                                <small ng-show="developerModeChangeForm.password.$error.minlength">The password is too short</small>
-                                <small ng-show="developerModeChangeForm.password.$error.maxlength">The password is too long</small>
-                                <small ng-show="developerModeChangeForm.password.$dirty && developerModeChange.error.password">Wrong password</small>
+                                <small ng-show=" developerModeChangeForm.password.$dirty && developerModeChangeForm.password.$invalid">A password is required</small>
+                                <small ng-show="!developerModeChangeForm.password.$dirty && developerModeChange.error.password">Wrong password</small>
                             </div>
-                            <input type="password" class="form-control" ng-model="developerModeChange.password" id="inputDeveloperModeChangePassword" name="password" ng-maxlength="30" ng-minlength="8" required autofocus>
+                            <input type="password" class="form-control" ng-model="developerModeChange.password" id="inputDeveloperModeChangePassword" name="password" required autofocus>
                         </div>
                         <input class="ng-hide" type="submit" ng-disabled="developerModeChangeForm.$invalid"/>
                     </fieldset>
diff --git a/webadmin/src/views/settings.js b/webadmin/src/views/settings.js
index 7d5cf694e..54a78a247 100644
--- a/webadmin/src/views/settings.js
+++ b/webadmin/src/views/settings.js
@@ -126,6 +126,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
                 if (error.statusCode === 403) {
                     $scope.developerModeChange.error.password = true;
                     $scope.developerModeChange.password = '';
+                    $scope.developerModeChangeForm.password.$setPristine();
                     $('#inputDeveloperModeChangePassword').focus();
                 } else {
                     console.error('Unable to change developer mode.', error);