diff --git a/src/oauth2views/password_reset.ejs b/src/oauth2views/password_reset.ejs
index fe41b598c..75df9ac98 100644
--- a/src/oauth2views/password_reset.ejs
+++ b/src/oauth2views/password_reset.ejs
@@ -25,7 +25,7 @@ app.controller('Controller', [function () {}]);
 
                 <div class="form-group" ng-class="{ 'has-error': resetForm.password.$dirty && resetForm.password.$invalid }">
                     <label class="control-label" for="inputPassword">New Password</label>
-                    <input type="password" class="form-control" id="inputPassword" ng-model="password" name="password" ng-maxlength="512" ng-minlength="5" autofocus required>
+                    <input type="password" class="form-control" id="inputPassword" ng-model="password" name="password" ng-maxlength="30" ng-minlength="8" autofocus required>
                 </div>
                 <div class="form-group" ng-class="{ 'has-error': resetForm.passwordRepeat.$dirty && (resetForm.passwordRepeat.$invalid || password !== passwordRepeat) }">
                     <label class="control-label" for="inputPasswordRepeat">Repeat Password</label>
diff --git a/src/oauth2views/password_setup.ejs b/src/oauth2views/password_setup.ejs
index 6e90c0998..2e8ec5b67 100644
--- a/src/oauth2views/password_setup.ejs
+++ b/src/oauth2views/password_setup.ejs
@@ -25,7 +25,7 @@ app.controller('Controller', [function () {}]);
 
                 <div class="form-group" ng-class="{ 'has-error': setupForm.password.$dirty && setupForm.password.$invalid }">
                     <label class="control-label" for="inputPassword">New Password</label>
-                    <input type="password" class="form-control" id="inputPassword" ng-model="password" name="password" ng-maxlength="512" ng-minlength="5" autofocus required>
+                    <input type="password" class="form-control" id="inputPassword" ng-model="password" name="password" ng-maxlength="30" ng-minlength="8" autofocus required>
                 </div>
                 <div class="form-group" ng-class="{ 'has-error': setupForm.passwordRepeat.$dirty && (setupForm.passwordRepeat.$invalid || password !== passwordRepeat) }">
                     <label class="control-label" for="inputPasswordRepeat">Repeat Password</label>
diff --git a/webadmin/src/index.html b/webadmin/src/index.html
index d24823ca8..fb972a2df 100644
--- a/webadmin/src/index.html
+++ b/webadmin/src/index.html
@@ -94,7 +94,7 @@
                                         <small ng-show="update_form.password.$error.maxlength">The password is too long</small>
                                         <small ng-show="update.error.password">Incorrect password</small>
                                     </div>
-                                    <input type="password" class="form-control" ng-model="update.password" id="inputUpdatePassword" name="password" placeholder="Password" ng-maxlength="512" ng-minlength="5" required autofocus>
+                                    <input type="password" class="form-control" ng-model="update.password" id="inputUpdatePassword" name="password" placeholder="Password" ng-maxlength="30" ng-minlength="8" required autofocus>
                                 </div>
                                 <input class="ng-hide" type="submit" ng-disabled="update_form.$invalid || update.busy"/>
                             </form>
diff --git a/webadmin/src/views/account.html b/webadmin/src/views/account.html
index e69be9cde..ffe80beac 100644
--- a/webadmin/src/views/account.html
+++ b/webadmin/src/views/account.html
@@ -16,7 +16,7 @@
                                 <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>
                             </div>
-                            <input type="password" class="form-control" ng-model="passwordchange.password" id="inputPasswordChangePassword" name="password" ng-maxlength="512" ng-minlength="5" required autofocus>
+                            <input type="password" class="form-control" ng-model="passwordchange.password" id="inputPasswordChangePassword" name="password" ng-maxlength="30" ng-minlength="8" required autofocus>
                         </div>
                         <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>
@@ -26,7 +26,7 @@
                                 <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="inputPasswordChangeNewPassword" 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="30" ng-minlength="8" required autofocus>
                         </div>
                         <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>
@@ -36,7 +36,7 @@
                                 <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="inputPasswordChangeNewPasswordRepeat" 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="30" ng-minlength="8" required autofocus>
                         </div>
                         <input class="ng-hide" type="submit" ng-disabled="passwordchange_form.$invalid"/>
                     </fieldset>
@@ -76,7 +76,7 @@
                                 <small ng-show="emailchange_form.password.$error.maxlength">The password is too long</small>
                                 <small ng-show="emailchange_form.password.$dirty && emailchange.error.password">Invalid pasword</small>
                             </div>
-                            <input type="password" class="form-control" ng-model="emailchange.password" id="inputEmailChangePassword" name="password" ng-maxlength="512" ng-minlength="5" required autofocus>
+                            <input type="password" class="form-control" ng-model="emailchange.password" id="inputEmailChangePassword" name="password" ng-maxlength="30" ng-minlength="8" required autofocus>
                         </div>
                         <input class="ng-hide" type="submit" ng-disabled="emailchange_form.$invalid"/>
                     </fieldset>
diff --git a/webadmin/src/views/apps.html b/webadmin/src/views/apps.html
index 288ec9a30..ad8e00db7 100644
--- a/webadmin/src/views/apps.html
+++ b/webadmin/src/views/apps.html
@@ -80,7 +80,7 @@
                         <br/>
                         <div class="form-group" ng-class="{ 'has-error': (appConfigureForm.password.$dirty && appConfigureForm.password.$invalid) || (!appConfigureForm.password.$dirty && appConfigure.error.password) }">
                             <label class="control-label" for="appConfigurePasswordInput">Provide your password to confirm this action</label>
-                            <input type="password" class="form-control" ng-model="appConfigure.password" id="appConfigurePasswordInput" name="password" ng-maxlength="512" ng-minlength="5" required>
+                            <input type="password" class="form-control" ng-model="appConfigure.password" id="appConfigurePasswordInput" name="password" ng-maxlength="30" ng-minlength="8" required>
                         </div>
                         <input class="ng-hide" type="submit" ng-disabled="appConfigureForm.$invalid || busy"/>
                     </form>
@@ -108,7 +108,7 @@
                     <form class="form-signin" role="form" name="appRestoreForm" ng-submit="doRestore()" autocomplete="off">
                         <div class="form-group" ng-class="{ 'has-error': (!appRestoreForm.password.$dirty && appRestore.error.password) || (appRestoreForm.password.$dirty && appRestoreForm.password.$invalid) }">
                             <label class="control-label" for="appRestorePasswordInput">Provide your password to confirm this action</label>
-                            <input type="password" class="form-control" ng-model="appRestore.password" id="appRestorePasswordInput" name="password" ng-maxlength="512" ng-minlength="5" required autofocus>
+                            <input type="password" class="form-control" ng-model="appRestore.password" id="appRestorePasswordInput" name="password" ng-maxlength="30" ng-minlength="8" required autofocus>
                         </div>
 
                         <input class="ng-hide" type="submit" ng-disabled="appRestoreForm.$invalid || busy"/>
@@ -154,7 +154,7 @@
                     <form class="form-signin" role="form" name="appUninstallForm" ng-submit="doUninstall()" autocomplete="off">
                         <div class="form-group" ng-class="{ 'has-error': (!appUninstallForm.password.$dirty && appUninstall.error.password) || (appUninstallForm.password.$dirty && appUninstallForm.password.$invalid) }">
                             <label class="control-label" for="appUninstallPasswordInput">Provide your password to confirm this action</label>
-                            <input type="password" class="form-control" ng-model="appUninstall.password" id="appUninstallPasswordInput" name="password" ng-maxlength="512" ng-minlength="5" required autofocus>
+                            <input type="password" class="form-control" ng-model="appUninstall.password" id="appUninstallPasswordInput" name="password" ng-maxlength="30" ng-minlength="8" required autofocus>
                         </div>
 
                         <input class="ng-hide" type="submit" ng-disabled="appUninstallForm.$invalid || busy"/>
@@ -198,7 +198,7 @@
                         </div>
                         <div class="form-group" ng-class="{ 'has-error': (!appUpdateForm.password.$dirty && appUpdate.error.password) || (appUpdateForm.password.$dirty && appUpdateForm.password.$invalid) }">
                             <label class="control-label" for="inputUpdatePassword">Provide your password to confirm this action</label>
-                            <input type="password" class="form-control" ng-model="appUpdate.password" id="inputUpdatePassword" name="password" ng-maxlength="512" ng-minlength="5" required autofocus>
+                            <input type="password" class="form-control" ng-model="appUpdate.password" id="inputUpdatePassword" name="password" ng-maxlength="30" ng-minlength="8" required autofocus>
                         </div>
                         <input class="ng-hide" type="submit" ng-disabled="appUpdateForm.$invalid || busy"/>
                     </form>
diff --git a/webadmin/src/views/settings.html b/webadmin/src/views/settings.html
index c0dcf990e..8a16455e2 100644
--- a/webadmin/src/views/settings.html
+++ b/webadmin/src/views/settings.html
@@ -17,7 +17,7 @@
                                 <small ng-show="developerModeChangeForm.password.$error.maxlength">The password is too long</small>
                                 <small ng-show="developerModeChangeForm.password.$dirty && developerModeChange.error.password">Invalid pasword</small>
                             </div>
-                            <input type="password" class="form-control" ng-model="developerModeChange.password" id="inputDeveloperModeChangePassword" name="password" ng-maxlength="512" ng-minlength="5" required autofocus>
+                            <input type="password" class="form-control" ng-model="developerModeChange.password" id="inputDeveloperModeChangePassword" name="password" ng-maxlength="30" ng-minlength="8" required autofocus>
                         </div>
                         <input class="ng-hide" type="submit" ng-disabled="developerModeChangeForm.$invalid"/>
                     </fieldset>
diff --git a/webadmin/src/views/setup/step2.html b/webadmin/src/views/setup/step2.html
index 6f700a4a7..510731f0b 100644
--- a/webadmin/src/views/setup/step2.html
+++ b/webadmin/src/views/setup/step2.html
@@ -17,7 +17,7 @@
             <input type="email" class="form-control" ng-model="wizard.email" id="inputEmail" name="email" placeholder="Email" ng-enter="focusNext('inputPassword', setup_form.email.$invalid)" required autocomplete="off">
         </div>
         <div class="form-group" ng-class="{ 'has-error': setup_form.password.$dirty && setup_form.password.$invalid }">
-            <input type="password" class="form-control" ng-model="wizard.password" id="inputPassword" name="password" placeholder="Password" ng-enter="next(setup_form.username.$invalid || setup_form.password.$invalid || setup_form.email.$invalid)" ng-maxlength="512" ng-minlength="5" required autocomplete="off">
+            <input type="password" class="form-control" ng-model="wizard.password" id="inputPassword" name="password" placeholder="Password" ng-enter="next(setup_form.username.$invalid || setup_form.password.$invalid || setup_form.email.$invalid)" ng-maxlength="30" ng-minlength="8" required autocomplete="off">
         </div>
     </div>
 </div>
diff --git a/webadmin/src/views/users.html b/webadmin/src/views/users.html
index d1bb13dbe..3b99d8214 100644
--- a/webadmin/src/views/users.html
+++ b/webadmin/src/views/users.html
@@ -83,7 +83,7 @@
                                 <small ng-show="userremove_form.password.$error.maxlength">The password is too long</small>
                                 <small ng-show="!useradd_form.email.$dirty && userremove.error.password">{{ userremove.error.password }}</small>
                             </div>
-                            <input type="password" class="form-control" ng-model="userremove.password" id="inputUserRemovePassword" name="password" placeholder="Password" ng-maxlength="512" ng-minlength="5" required>
+                            <input type="password" class="form-control" ng-model="userremove.password" id="inputUserRemovePassword" name="password" placeholder="Password" ng-maxlength="30" ng-minlength="8" required>
                         </div>
                         <input class="hide" type="submit"/>
                     </fieldset>