diff --git a/modules/user/user.js b/modules/user/user.js
index d182066..79f2689 100644
--- a/modules/user/user.js
+++ b/modules/user/user.js
@@ -106,9 +106,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/modules/user/user.module b/modules/user/user.module
index 5124207..04471ea 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -3587,7 +3587,7 @@ function user_form_process_password_confirm($element) {
     'password' => array(
       'strengthTitle' => t('Password strength:'),
       'hasWeaknesses' => t('To make your password stronger:'),
-      'tooShort' => t('Make it at least 6 characters'),
+      'numCharacters' => 6,
       'addLowerCase' => t('Add lowercase letters'),
       'addUpperCase' => t('Add uppercase letters'),
       'addNumbers' => t('Add numbers'),
@@ -3604,6 +3604,9 @@ function user_form_process_password_confirm($element) {
     ),
   );
 
+  // Set the tooShort message based on the numCharacters.
+  $js_settings['password']['tooShort'] = t('Make it at least @num characters', array('@num' => $js_settings['password']['numCharacters']));
+
   $element['#attached']['js'][] = drupal_get_path('module', 'user') . '/user.js';
   // Ensure settings are only added once per page.
   static $already_added = FALSE;