diff --git a/src/oauth2views/account_setup.ejs b/src/oauth2views/account_setup.ejs
index 8e2302a84..59045b5ad 100644
--- a/src/oauth2views/account_setup.ejs
+++ b/src/oauth2views/account_setup.ejs
@@ -58,9 +58,9 @@ app.controller('Controller', ['$scope', function ($scope) {
           <div class="form-group" ng-class="{ 'has-error': (setupForm.password.$dirty && setupForm.password.$invalid) }">
             <label class="control-label">New Password</label>
             <div class="control-label" ng-show="setupForm.password.$dirty && setupForm.password.$invalid">
-              <small ng-show="setupForm.password.$dirty && setupForm.password.$invalid">Password must be 8-30 character with at least one uppercase, one numeric and one special character</small>
+              <small ng-show="setupForm.password.$dirty && setupForm.password.$invalid">Password must be atleast 8 characters</small>
             </div>
-            <input type="password" class="form-control" ng-model="password" name="password" ng-pattern="/^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])(?!.*\s).{8,30}$/" required>
+            <input type="password" class="form-control" ng-model="password" name="password" ng-pattern="/^.{8,30}$/" required>
           </div>
 
           <div class="form-group" ng-class="{ 'has-error': (setupForm.passwordRepeat.$dirty && (password !== passwordRepeat)) }">
diff --git a/src/oauth2views/password_reset.ejs b/src/oauth2views/password_reset.ejs
index 5b7301629..404a5c36a 100644
--- a/src/oauth2views/password_reset.ejs
+++ b/src/oauth2views/password_reset.ejs
@@ -31,9 +31,9 @@ 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>
             <div class="control-label" ng-show="resetForm.password.$dirty && resetForm.password.$invalid">
-              <small ng-show="resetForm.password.$dirty && resetForm.password.$invalid">Password must be 8-30 character with at least one uppercase, one numeric and one special character</small>
+              <small ng-show="resetForm.password.$dirty && resetForm.password.$invalid">Password must be atleast 8 characters</small>
             </div>
-            <input type="password" class="form-control" id="inputPassword" ng-model="password" name="password" ng-pattern="/^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])(?!.*\s).{8,30}$/" autofocus required>
+            <input type="password" class="form-control" id="inputPassword" ng-model="password" name="password" ng-pattern="/^.{8,30}$/" autofocus required>
           </div>
           <div class="form-group" ng-class="{ 'has-error': resetForm.passwordRepeat.$dirty && (password !== passwordRepeat) }">
             <label class="control-label" for="inputPasswordRepeat">Repeat Password</label>