diff --git a/core/modules/user/user.js b/core/modules/user/user.js
old mode 100644
new mode 100755
index 45181fb..5dc830d
--- a/core/modules/user/user.js
+++ b/core/modules/user/user.js
@@ -101,9 +101,9 @@ Drupal.evaluatePasswordStrength = function (password, translate) {
   var username = (usernameBox.length > 0) ? usernameBox.val() : translate.username;
 
   // Lose 5 points for every character less than 6, plus a 30 point penalty.
-  if (password.length < 6) {
+  if (password.length < translate.numCharacters) {
     msg.push(translate.tooShort);
-    strength -= ((6 - password.length) * 5) + 30;
+    strength -= ((translate.numCharacters - password.length) * 5) + 30;
   }
 
   // Count weaknesses.
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
old mode 100644
new mode 100755
index 24aee74..f782dfd
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -1788,10 +1788,11 @@ function user_form_process_password_confirm($element) {
 
     global $user;
     $password_settings['showStrengthIndicator'] = TRUE;
+    $password_settings['numCharacters'] = 6;
     $password_settings += array(
       'strengthTitle' => t('Password strength:'),
       'hasWeaknesses' => t('To make your password stronger:'),
-      'tooShort' => t('Make it at least 6 characters'),
+      'tooShort' => t('Make it at least @num characters', array('@num' => $password_settings['numCharacters'])),
       'addLowerCase' => t('Add lowercase letters'),
       'addUpperCase' => t('Add uppercase letters'),
       'addNumbers' => t('Add numbers'),