diff --git a/cps/static/js/password.js b/cps/static/js/password.js
index 7ab7e8f3..43a1a0ac 100644
--- a/cps/static/js/password.js
+++ b/cps/static/js/password.js
@@ -24,35 +24,40 @@ $(document).ready(function() {
           },
 
         }, function () {
-        // Initialized and ready to go
-        var options = {};
-        options.ui = {
-            bootstrap3: true,
-            showProgressBar: false,
-            showErrors: true,
-            showVerdicts: false,
-        }
-        options.rules= {
-            activated: {
-                wordNotEmail: false,
-                wordMinLength: true,
-                // wordMaxLength: false,
-                // wordInvalidChar: true,
-                wordSimilarToUsername: false,
-                wordSequences: false,
-                wordTwoCharacterClasses: false,
-                wordRepetitions: false,
-                //wordLowercase: true,
-                //wordUppercase: true,
-                wordOneNumber: true,
-                wordThreeNumbers: false,
-                wordOneSpecialChar: true,
-                // wordTwoSpecialChar: true,
-                wordUpperLowerCombo: false,
-                wordLetterNumberCombo: false,
-                wordLetterNumberCharCombo: false
+        if ($('#password').data("verify")) {
+            // Initialized and ready to go
+            var options = {};
+            options.common = {
+                minChar: $('#password').data("min")
             }
+            options.ui = {
+                bootstrap3: true,
+                showProgressBar: false,
+                showErrors: true,
+                showVerdicts: false,
+            }
+            options.rules= {
+                activated: {
+                    wordNotEmail: false,
+                    wordMinLength: $('#password').data("min") ? true : false,
+                    // wordMaxLength: false,
+                    // wordInvalidChar: true,
+                    wordSimilarToUsername: false,
+                    wordSequences: false,
+                    wordTwoCharacterClasses: false,
+                    wordRepetitions: false,
+                    wordLowercase: $('#password').data("lower") ? true : false,
+                    wordUppercase: $('#password').data("upper") ? true : false,
+                    wordOneNumber: $('#password').data("number") ? true : false,
+                    wordThreeNumbers: false,
+                    wordOneSpecialChar: $('#password').data("special") ? true : false,
+                    // wordTwoSpecialChar: true,
+                    wordUpperLowerCombo: false,
+                    wordLetterNumberCombo: false,
+                    wordLetterNumberCharCombo: false
+                }
+            }
+            $('#password').pwstrength(options);
         }
-        $('#password').pwstrength(options);
     });
 });
diff --git a/cps/templates/config_edit.html b/cps/templates/config_edit.html
index fded8721..92e38217 100644
--- a/cps/templates/config_edit.html
+++ b/cps/templates/config_edit.html
@@ -352,6 +352,7 @@
         {% endif %}
       </div>
     </div>
+  </div>
   <div class="panel panel-default">
     <div class="panel-heading">
       <h4 class="panel-title">
@@ -370,9 +371,8 @@
                   <option value="1" {% if config.config_session == 1 %}selected{% endif %}>{{_('Strong')}}</option>
                 </select>
             </div>
-
             <div class="form-group">
-                <input type="checkbox" id="config_password_policy" data-control="password_settings" name="config_password_policy" {% if config.config_password %}checked{% endif %}>
+                <input type="checkbox" id="config_password_policy" data-control="password_settings" name="config_password_policy" {% if config.config_password_policy %}checked{% endif %}>
                 <label for="config_password_policy">{{_('User Password policy')}}</label>
             </div>
             <div data-related="password_settings">
@@ -393,13 +393,14 @@
                 <label for="config_password_upper">{{_('Enforce uppercase characters')}}</label>
               </div>
               <div class="form-group" style="margin-left:10px;">
-                <input type="checkbox" id="config_password_special" name="config_password_special"  {% if config.config_kobo_proxy %}checked{% endif %}>
+                <input type="checkbox" id="config_password_special" name="config_password_special"  {% if config.config_password_special %}checked{% endif %}>
                 <label for="config_password_special">{{_('Enforce special characters')}}</label>
               </div>
             </div>
       </div>
     </div>
   </div>
+</div>
 </div>
     <div class="col-sm-12">
     <button type="button" name="submit" id="config_submit" class="btn btn-default">{{_('Save')}}</button>
diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html
index aea2156f..fd233d65 100755
--- a/cps/templates/user_edit.html
+++ b/cps/templates/user_edit.html
@@ -21,7 +21,7 @@
       {% endif %}
         <div class="form-group">
           <label for="password">{{_('Password')}}</label>
-          <input type="password" class="form-control" name="password" id="password" data-lang="{{ g.user.locale }}" value="" autocomplete="off">
+          <input type="password" class="form-control" name="password" id="password" data-lang="{{ g.user.locale }}" data-verify="{{ config.config_password_policy }}" {% if config.config_password_policy %} data-min={{ config.config_password_min_length }} data-special={{ config.config_password_special }} data-upper={{ config.config_password_upper }} data-lower={{ config.config_password_lower }} data-number={{ config.config_password_number }}{% endif %} value="" autocomplete="off">
         </div>
     {% endif %}
     <div class="form-group">
diff --git a/cps/web.py b/cps/web.py
index dcccbc32..02ac75b1 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -1382,6 +1382,7 @@ def change_profile(kobo_support, local_oauth_check, oauth_status, translations,
         flash(str(ex), category="error")
         return render_title_template("user_edit.html",
                                      content=current_user,
+                                     config=config,
                                      translations=translations,
                                      profile=1,
                                      languages=languages,
@@ -1433,6 +1434,7 @@ def profile():
                                  profile=1,
                                  languages=languages,
                                  content=current_user,
+                                 config=config,
                                  kobo_support=kobo_support,
                                  title=_(u"%(name)s's profile", name=current_user.name),
                                  page="me",