diff --git a/wp-login.php b/wp-login.php
index 1fc9ff5feb..6f107f084f 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -198,10 +198,9 @@ break;
 
 case 'retrievepassword':
 
-	$user_login = $_POST["user_login"];
-	$user_data = get_userdatabylogin($user_login);
+	$user_data = get_userdatabylogin($_POST["user_login"]);
 	// redefining user_login ensures we return the right case in the email
-	$user_login = $user_data['user_login'];
+	$user_login = $user_data->user_login;
 	$user_email = $user_data->user_email;
 
 	if (!$user_email || $user_email != $_POST['email']) die(sprintf(__('Sorry, that user does not seem to exist in our database. Perhaps you have the wrong username or email address? <a href="%s">Try again</a>.'), 'wp-login.php?action=lostpassword'));