diff --git a/modules/system/system.test b/modules/system/system.test
index 95b4353..c20de1b 100644
--- a/modules/system/system.test
+++ b/modules/system/system.test
@@ -1223,7 +1223,7 @@ class SiteMaintenanceTestCase extends DrupalWebTestCase {
     $edit = array(
       'name' => $this->user->name,
     );
-    $this->drupalPost('user/password', $edit, t('E-mail new password'));
+    $this->drupalPost('user/password', $edit, t('Submit'));
     $mails = $this->drupalGetMails();
     $start = strpos($mails[0]['body'], 'user/reset/'. $this->user->uid);
     $path = substr($mails[0]['body'], $start, 66 + strlen($this->user->uid));
diff --git a/modules/user/user.module b/modules/user/user.module
index d38de69..8c2407d 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1099,8 +1099,15 @@ function user_account_form(&$form, &$form_state) {
     if (!$pass_reset) {
       $protected_values['mail'] = $form['account']['mail']['#title'];
       $protected_values['pass'] = t('Password');
-      $request_new = l(t('Request new password'), 'user/password', array('attributes' => array('title' => t('Request new password via e-mail.'))));
-      $current_pass_description = t('Enter your current password to change the %mail or %pass. !request_new.', array('%mail' => $protected_values['mail'], '%pass' => $protected_values['pass'], '!request_new' => $request_new));
+      $request_new = l(t('Reset your password'), 'user/password',
+        array('attributes' => array('title' => t('Send password reset instructions via e-mail.')))
+      );
+      $current_pass_description = t('Enter your current password to change the %mail or %pass. !request_new.',
+        array(
+          '%mail' => $protected_values['mail'],
+          '%pass' => $protected_values['pass'],
+          '!request_new' => $request_new)
+      );
     }
     // The user must enter their current password to change to a new one.
     if ($user->uid == $account->uid) {
@@ -1359,7 +1366,7 @@ function user_login_block($form) {
   if (variable_get('user_register', USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL)) {
     $items[] = l(t('Create new account'), 'user/register', array('attributes' => array('title' => t('Create a new user account.'))));
   }
-  $items[] = l(t('Request new password'), 'user/password', array('attributes' => array('title' => t('Request new password via e-mail.'))));
+  $items[] = l(t('Reset your password'), 'user/password', array('attributes' => array('title' => t('Send password reset instructions via e-mail.'))));
   $form['links'] = array('#markup' => theme('item_list', array('items' => $items)));
   return $form;
 }
@@ -1667,7 +1674,7 @@ function user_menu() {
   );
 
   $items['user/password'] = array(
-    'title' => 'Request new password',
+    'title' => 'Reset your password',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('user_pass'),
     'access callback' => TRUE,
diff --git a/modules/user/user.pages.inc b/modules/user/user.pages.inc
index 2d3c13d..7a235fc 100644
--- a/modules/user/user.pages.inc
+++ b/modules/user/user.pages.inc
@@ -36,7 +36,6 @@ function user_pass() {
     '#size' => 60,
     '#maxlength' => max(USERNAME_MAX_LENGTH, EMAIL_MAX_LENGTH),
     '#required' => TRUE,
-    '#default_value' => isset($_GET['name']) ? $_GET['name'] : '',
   );
   // Allow logged in users to request this also.
   if ($user->uid > 0) {
@@ -44,12 +43,20 @@ function user_pass() {
     $form['name']['#value'] = $user->mail;
     $form['mail'] = array(
       '#prefix' => '<p>',
-      '#markup' =>  t('Password reset instructions will be mailed to %email. You must log out to use the password reset link in the e-mail.', array('%email' => $user->mail)),
+      '#markup' => t('Password reset instructions will be mailed to %email. You must log out to use the password reset link in the e-mail.', array('%email' => $user->mail)),
       '#suffix' => '</p>',
     );
   }
+  else {
+    $form['mail'] = array(
+      '#prefix' => '<p>',
+      '#markup' => t('Password reset instructions will be sent to your registered email address.'),
+      '#suffix' => '</p>',
+    );
+    $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'));
+  $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Submit'));
 
   return $form;
 }
diff --git a/modules/user/user.test b/modules/user/user.test
index b9729c5..a0bfbf9 100644
--- a/modules/user/user.test
+++ b/modules/user/user.test
@@ -475,7 +475,7 @@ class UserPasswordResetTestCase extends DrupalWebTestCase {
     $this->drupalLogout();
     // Attempt to reset password.
     $edit = array('name' => $account->name);
-    $this->drupalPost('user/password', $edit, t('E-mail new password'));
+    $this->drupalPost('user/password', $edit, t('Submit'));
     // Confirm the password reset.
     $this->assertText(t('Further instructions have been sent to your e-mail address.'), 'Password reset instructions mailed message displayed.');
   }