diff --git a/core/modules/system/lib/Drupal/system/Tests/System/SiteMaintenanceTest.php b/core/modules/system/lib/Drupal/system/Tests/System/SiteMaintenanceTest.php
index 7788c67..f356226 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/SiteMaintenanceTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/SiteMaintenanceTest.php
@@ -102,7 +102,7 @@ class SiteMaintenanceTest extends WebTestBase {
     $edit = array(
       'name' => $this->user->name,
     );
-    $this->drupalPost('user/password', $edit, t('E-mail new password'));
+    $this->drupalPost('user/password', $edit, t('Send login link by e-mail'));
     $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/core/modules/user/lib/Drupal/user/Tests/UserPasswordResetTest.php b/core/modules/user/lib/Drupal/user/Tests/UserPasswordResetTest.php
index 575409f..ee9a4eb 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserPasswordResetTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserPasswordResetTest.php
@@ -33,7 +33,7 @@ class UserPasswordResetTest extends WebTestBase {
     $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('Send login link by e-mail'));
     // Confirm the password reset.
     $this->assertText(t('Further instructions have been sent to your e-mail address.'), 'Password reset instructions mailed message displayed.');
   }
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 2250110..de5cea7 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -766,8 +766,8 @@ 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('Required if you want to change the %mail or %pass below. !request_new.', array('%mail' => $protected_values['mail'], '%pass' => $protected_values['pass'], '!request_new' => $request_new));
+      $request_new = l(t('Reset password'), 'user/password', array('attributes' => array('title' => t('Send a one-time login link to the account e-mail address.'))));
+      $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) {
@@ -1061,8 +1061,8 @@ 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.'))));
-  $form['links'] = array('#theme' => 'item_list', '#items' => $items);
+  $items[] = l(t('Forgot your password?'), 'user/password', array('attributes' => array('title' => t('Send a one-time login link to the account e-mail address.'))));
+  $form['links'] = array('#markup' => theme('item_list', array('items' => $items)));
   return $form;
 }
 
@@ -1504,12 +1504,13 @@ function user_menu() {
   );
 
   $items['user/password'] = array(
-    'title' => 'Request new password',
+    'title' => 'Forgot your password?',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('user_pass'),
     'access callback' => TRUE,
     'type' => MENU_LOCAL_TASK,
     'file' => 'user.pages.inc',
+    'weight' => '1',
   );
   $items['user/reset/%/%/%'] = array(
     'title' => 'Reset password',
diff --git a/core/modules/user/user.pages.inc b/core/modules/user/user.pages.inc
index 6cdfd25..b0e6b9c 100644
--- a/core/modules/user/user.pages.inc
+++ b/core/modules/user/user.pages.inc
@@ -51,7 +51,7 @@ function user_pass() {
     );
   }
   $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('Send login link by e-mail'));
 
   return $form;
 }