Index: src/wp-login.php
===================================================================
--- src/wp-login.php	(revision 31909)
+++ src/wp-login.php	(working copy)
@@ -278,8 +278,6 @@
 		$errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.'));
 	} elseif ( strpos( $_POST['user_login'], '@' ) ) {
 		$user_data = get_user_by( 'email', trim( $_POST['user_login'] ) );
-		if ( empty( $user_data ) )
-			$errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.'));
 	} else {
 		$login = trim($_POST['user_login']);
 		$user_data = get_user_by('login', $login);
@@ -295,14 +293,13 @@
 	if ( $errors->get_error_code() )
 		return $errors;
 
-	if ( !$user_data ) {
-		$errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or e-mail.'));
-		return $errors;
-	}
-
 	// Redefining user_login ensures we return the right case in the email.
+    if ( $user_data ) {
 	$user_login = $user_data->user_login;
 	$user_email = $user_data->user_email;
+    } else {
+        return;
+    }
 
 	/**
 	 * Fires before a new password is retrieved.
@@ -861,7 +858,7 @@
 		elseif	( isset($_GET['registration']) && 'disabled' == $_GET['registration'] )
 			$errors->add('registerdisabled', __('User registration is currently not allowed.'));
 		elseif	( isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail'] )
-			$errors->add('confirm', __('Check your e-mail for the confirmation link.'), 'message');
+            $errors->add('confirm', __('If this username or email address is correct, you will receive an email confirmation link shortly.'), 'message');
 		elseif	( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] )
 			$errors->add('newpass', __('Check your e-mail for your new password.'), 'message');
 		elseif	( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] )