diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index bdf5862..826526e 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -1369,7 +1369,7 @@ function user_login_final_validate($form, &$form_state) {
       }
     }
     else {
-      form_set_error('name', t('Sorry, unrecognized username or password. <a href="@password">Have you forgotten your password?</a>', array('@password' => url('user/password'))));
+      form_set_error('name', t('Sorry, unrecognized username or password. <a href="@password">Have you forgotten your password?</a>', array('@password' => url('user/password', array('query' => array('name' => $form_state['values']['name']))))));
       watchdog('user', 'Login attempt failed for %user.', array('%user' => $form_state['values']['name']));
     }
   }
diff --git a/core/modules/user/user.pages.inc b/core/modules/user/user.pages.inc
index 140b767..4776845 100644
--- a/core/modules/user/user.pages.inc
+++ b/core/modules/user/user.pages.inc
@@ -38,6 +38,9 @@ function user_pass() {
       '#suffix' => '</p>',
     );
   }
+  else {
+    $form['name']['#default_value'] = isset($_GET['name']) ? $_GET['name'] : '';
+  }
   $form['actions'] = array('#type' => 'actions');
   $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('E-mail new password'));