diff --git a/modules/user.module b/modules/user.module
index 89acdf372d252d41d43bc5076537d24b1334afc1..28df629d76594f28ce395e8c4348c403c45aa240 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -904,7 +904,7 @@ function user_login_validate($form_id, $form_values) {
   if ($form_values['name']) {
     if (user_is_blocked($form_values['name'])) {
       // blocked in user administration
-      form_set_error('login', t('The username %name has been blocked.', array('%name' => theme('placeholder', $form_values['name']))));
+      form_set_error('login', t('The username %name has not been activated or is blocked.', array('%name' => theme('placeholder', $form_values['name']))));
     }
     else if (drupal_is_denied('user', $form_values['name'])) {
       // denied by access controls
diff --git a/modules/user/user.module b/modules/user/user.module
index 89acdf372d252d41d43bc5076537d24b1334afc1..28df629d76594f28ce395e8c4348c403c45aa240 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -904,7 +904,7 @@ function user_login_validate($form_id, $form_values) {
   if ($form_values['name']) {
     if (user_is_blocked($form_values['name'])) {
       // blocked in user administration
-      form_set_error('login', t('The username %name has been blocked.', array('%name' => theme('placeholder', $form_values['name']))));
+      form_set_error('login', t('The username %name has not been activated or is blocked.', array('%name' => theme('placeholder', $form_values['name']))));
     }
     else if (drupal_is_denied('user', $form_values['name'])) {
       // denied by access controls