Index: wp-login.php
===================================================================
--- wp-login.php	(revision 15646)
+++ wp-login.php	(working copy)
@@ -533,6 +533,9 @@
 
 	$user = wp_signon('', $secure_cookie);
 
+	if ( is_wp_error( $user ) && is_user_logged_in() )
+		$user = wp_get_current_user();
+
 	$redirect_to = apply_filters('login_redirect', $redirect_to, isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '', $user);
 
 	if ( !is_wp_error($user) && !$reauth ) {