diff --git a/src/setup.html b/src/setup.html
index f813911c4..f0022dac6 100644
--- a/src/setup.html
+++ b/src/setup.html
@@ -84,7 +84,7 @@
                                 </div>
                                 <div class="form-group" ng-class="{ 'has-error': setupForm.password.$dirty && setupForm.password.$invalid }">
                                     <label class="control-label">Password</label>
-                                    <input type="password" class="form-control" ng-model="account.password" id="inputPassword" name="password" placeholder="Password" ng-pattern="/^.{8,30}$/" required autocomplete="off">
+                                    <input type="password" class="form-control" ng-model="account.password" id="inputPassword" name="password" placeholder="Password" ng-pattern="/^.{8,}$/" required autocomplete="off">
                                     <div class="control-label" ng-show="setupForm.password.$dirty && setupForm.password.$invalid">
                                         <small ng-show="setupForm.password.$dirty && setupForm.password.$invalid">Password must be atleast 8 characters</small>
                                     </div>
diff --git a/src/views/account.html b/src/views/account.html
index 827bf3554..e170ee1bc 100644
--- a/src/views/account.html
+++ b/src/views/account.html
@@ -22,7 +22,7 @@
                             <small ng-show="!passwordChangeForm.newPassword.$dirty && passwordchange.error.newPassword">{{ passwordchange.error.newPassword }}<br/><br/></small>
                             <small ng-show=" passwordChangeForm.newPassword.$dirty && passwordChangeForm.newPassword.$invalid">Password must be atleast 8 characters</small>
                         </div>
-                        <input type="password" class="form-control" ng-model="passwordchange.newPassword" id="inputPasswordChangeNewPassword" name="newPassword" ng-pattern="/^.{8,30}$/" required autofocus>
+                        <input type="password" class="form-control" ng-model="passwordchange.newPassword" id="inputPasswordChangeNewPassword" name="newPassword" ng-pattern="/^.{8,}$/" required autofocus>
                     </div>
                     <div class="form-group" ng-class="{ 'has-error': (!passwordChangeForm.newPassword.$dirty && passwordchange.error.newPassword) || (passwordChangeForm.newPasswordRepeat.$dirty && passwordChangeForm.newPasswordRepeat.$error.required) || (passwordChangeForm.newPasswordRepeat.$dirty && passwordchange.newPassword !== passwordchange.newPasswordRepeat) }">
                         <label class="control-label" for="inputPasswordChangeNewPasswordRepeat">Repeat new password</label>