Index: modules/user/user.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.pages.inc,v
retrieving revision 1.75
diff -u -p -r1.75 user.pages.inc
--- modules/user/user.pages.inc	27 Aug 2010 11:28:45 -0000	1.75
+++ modules/user/user.pages.inc	10 Sep 2010 18:32:29 -0000
@@ -57,13 +57,20 @@ function user_pass() {
 function user_pass_validate($form, &$form_state) {
   $name = trim($form_state['values']['name']);
   // Try to load by email.
-  $users = user_load_multiple(array(), array('mail' => $name, 'status' => '1'));
+  $users = user_load_multiple(array(), array('mail' => $name));
   $account = reset($users);
   if (!$account) {
     // No success, try to load by name.
-    $users = user_load_multiple(array(), array('name' => $name, 'status' => '1'));
+    $users = user_load_multiple(array(), array('name' => $name));
     $account = reset($users);
   }
+  if ($account){
+    // Blocked accounts cannot request a new password,
+    // check provided username and email against access rules.
+    if ($account->status == 0) {
+      form_set_error('name', t('Sorry, the username %name has not been activated yet or is blocked.', array('%name' => $name)));
+    }
+  }
   if (isset($account->uid)) {
     form_set_value(array('#parents' => array('account')), $account, $form_state);
   }