Index: wp-login.php
===================================================================
--- wp-login.php	(revision 17333)
+++ wp-login.php	(working copy)
@@ -411,7 +411,7 @@
 	</p>
 <?php do_action('lostpassword_form'); ?>
 	<input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
-	<p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button-primary" value="<?php esc_attr_e('Get New Password'); ?>" tabindex="100" /></p>
+	<p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button-primary" value="<?php esc_attr_e('Email Password Reset Link'); ?>" tabindex="100" /></p>
 </form>
 
 <p id="nav">
@@ -440,8 +440,7 @@
 		$errors = new WP_Error('password_reset_mismatch', __('The passwords do not match.'));
 	} elseif ( isset($_POST['pass1']) && !empty($_POST['pass1']) ) {
 		reset_password($user, $_POST['pass1']);
-		login_header(__('Password Reset'), '<p class="message reset-pass">' . __('Your password has been reset.') . ' <a href="' . site_url('wp-login.php', 'login') . '">' . __('Log in') . '</a></p>');
-		login_footer();
+		wp_safe_redirect( 'wp-login.php?passwordresetcomplete=true' );
 		exit;
 	}
 
@@ -616,6 +615,8 @@
 		$errors->add('registered', __('Registration complete. Please check your e-mail.'), 'message');
 	elseif	( $interim_login )
 		$errors->add('expired', __('Your session has expired. Please log-in again.'), 'message');
+	elseif	( isset($_GET['passwordresetcomplete']) && 'true' == $_GET['passwordresetcomplete'] )
+		$errors->add('newpass', __('Your password has been reset.'), 'message');
 
 	// Clear any stale cookies.
 	if ( $reauth )
@@ -626,6 +627,8 @@
 	if ( isset($_POST['log']) )
 		$user_login = ( 'incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code() ) ? esc_attr(stripslashes($_POST['log'])) : '';
 	$rememberme = ! empty( $_POST['rememberme'] );
+	
+if ( ! isset($_GET['checkemail']) || ! in_array( $_GET['checkemail'], array('confirm', 'newpass') ) ) :
 ?>
 
 <form name="loginform" id="loginform" action="<?php echo site_url('wp-login.php', 'login_post') ?>" method="post">
@@ -650,9 +653,13 @@
 	</p>
 </form>
 
-<?php if ( !$interim_login ) { ?>
+<?php
+endif;
+if ( !$interim_login ) {
+?>
 <p id="nav">
 <?php if ( isset($_GET['checkemail']) && in_array( $_GET['checkemail'], array('confirm', 'newpass') ) ) : ?>
+<a href="<?php echo site_url('wp-login.php', 'login') ?>"><?php _e('Login') ?></a>
 <?php elseif ( get_option('users_can_register') ) : ?>
 <a href="<?php echo site_url('wp-login.php?action=register', 'login') ?>"><?php _e('Register') ?></a> |
 <a href="<?php echo site_url('wp-login.php?action=lostpassword', 'login') ?>" title="<?php _e('Password Lost and Found') ?>"><?php _e('Lost your password?') ?></a>