Index: wp-login.php
===================================================================
--- wp-login.php	(revision 3964)
+++ wp-login.php	(working copy)
@@ -204,10 +204,13 @@
 			wp_redirect($redirect_to);
 			exit;
 		} else {
+			$error = __('Incorrect username or password.');
 			if ( $using_cookie )
 				$error = __('Your session has expired.');
 		}
 	}
+	else if ( $user_login || $user_pass )
+		$error = __('Incorrect username or password.');
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">

