Index: wp-login.php
===================================================================
--- wp-login.php        (revision 8371)
+++ wp-login.php        (working copy)
@@ -129,6 +129,11 @@
        do_action('retreive_password', $user_login);  // Misspelled and deprecated
        do_action('retrieve_password', $user_login);

+        do_action_ref_array('retrieve_password_error', array($user_data->ID, &$pass_error));
+        if (!empty($pass_error)) {
+                return new WP_Error('retrieve_password_error', __("<strong>ERROR</strong>: $pass_error."));
+        }
+
        $key = $wpdb->get_var($wpdb->prepare("SELECT user_activation_key FROM $wpdb->users WHERE user_login = %s", $user_login));
        if ( empty($key) ) {
                // Generate something random for a key...
@@ -489,4 +494,4 @@

 break;
 } // end action switch
-?>
\ No newline at end of file
+?>