diff --git a/core/modules/user/user.js b/core/modules/user/user.js
index 554284b..4bcd2f5 100644
--- a/core/modules/user/user.js
+++ b/core/modules/user/user.js
@@ -101,9 +101,9 @@
     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 < 12) {
       msg.push(translate.tooShort);
-      strength -= ((6 - password.length) * 5) + 30;
+      strength -= ((12 - password.length) * 5) + 30;
     }
 
     // Count weaknesses.
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index a02d098..c2c80be 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -1339,7 +1339,7 @@ function user_form_process_password_confirm($element) {
     $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 12 characters'),
       'addLowerCase' => t('Add lowercase letters'),
       'addUpperCase' => t('Add uppercase letters'),
       'addNumbers' => t('Add numbers'),