diff --git a/src/login.html b/src/login.html
index a3bc62718..3807502bc 100644
--- a/src/login.html
+++ b/src/login.html
@@ -143,7 +143,7 @@
               <div class="control-label" ng-show="newPasswordForm.newPassword.$dirty && newPasswordForm.newPassword.$invalid">
                 <small ng-show="newPasswordForm.newPassword.$dirty && newPasswordForm.newPassword.$invalid">Password must be atleast 8 characters</small>
               </div>
-              <input type="password" class="form-control" id="inputNewPassword" ng-model="newPassword" name="newPassword" ng-pattern="/^.{8,30}$/" autofocus required>
+              <input type="password" class="form-control" id="inputNewPassword" ng-model="newPassword" name="newPassword" ng-minlength="8" ng-maxlength="256" autofocus required>
             </div>
             <div class="form-group" ng-class="{ 'has-error': newPasswordForm.newPasswordRepeat.$dirty && (newPassword !== newPasswordRepeat) }">
               <label class="control-label" for="inputNewPasswordRepeat">Repeat Password</label>
diff --git a/src/views/profile.html b/src/views/profile.html
index a7232c47f..694c37895 100644
--- a/src/views/profile.html
+++ b/src/views/profile.html
@@ -57,7 +57,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,}$/" required autofocus>
+                        <input type="password" class="form-control" ng-model="passwordchange.newPassword" id="inputPasswordChangeNewPassword" name="newPassword" ng-minlength="8" ng-maxlength="256" 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>