Index: wp-login.php
===================================================================
--- wp-login.php	(revision 4784)
+++ wp-login.php	(working copy)
@@ -73,7 +73,7 @@
 case 'logout' :
 
 	wp_clearcookie();
-	do_action('wp_logout');
+	do_action('wp_logout', $userdata->name, $userdata);
 
 	$redirect_to = 'wp-login.php?loggedout=true';
 	if ( isset( $_REQUEST['redirect_to'] ) )
@@ -106,8 +106,8 @@
 			if (!$user_email || $user_email != $_POST['user_email']) {
 				$errors['invalidcombo'] = __('<strong>ERROR</strong>: Invalid username / e-mail combination.');
 			} else {
-				do_action('retreive_password', $user_login);  // Misspelled and deprecated
-				do_action('retrieve_password', $user_login);
+				do_action('retreive_password', $user_login, $user_email);  // Misspelled and deprecated
+				do_action('retrieve_password', $user_login, $user_email);
 
 				// Generate something random for a password... md5'ing current time with a rand salt
 				$key = substr( md5( uniqid( microtime() ) ), 0, 8);
@@ -179,7 +179,7 @@
 		exit();
 	}
 
-	do_action('password_reset');
+	do_action('password_reset', $user->user_login, $user);
 
 	// Generate something random for a password... md5'ing current time with a rand salt
 	$new_pass = substr( md5( uniqid( microtime() ) ), 0, 7);
@@ -317,7 +317,7 @@
 		if ( wp_login($user_login, $user_pass, $using_cookie) ) {
 			if ( !$using_cookie )
 				wp_setcookie($user_login, $user_pass, false, '', '', $rememberme);
-			do_action('wp_login', $user_login);
+			do_action('wp_login', $user_login, $user);
 			wp_redirect($redirect_to);
 			exit();
 		} else {