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 1cb582a..cb8d5b4 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/SiteMaintenanceTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/SiteMaintenanceTest.php
@@ -110,7 +110,7 @@ function testSiteMaintenance() {
     $edit = array(
       'name' => $this->user->getUsername(),
     );
-    $this->drupalPostForm('user/password', $edit, t('E-mail new password'));
+    $this->drupalPostForm('user/password', $edit, t('Submit'));
     $mails = $this->drupalGetMails();
     $start = strpos($mails[0]['body'], 'user/reset/'. $this->user->id());
     $path = substr($mails[0]['body'], $start, 66 + strlen($this->user->id()));
diff --git a/core/modules/user/lib/Drupal/user/AccountFormController.php b/core/modules/user/lib/Drupal/user/AccountFormController.php
index 1179cdc..cb95d82 100644
--- a/core/modules/user/lib/Drupal/user/AccountFormController.php
+++ b/core/modules/user/lib/Drupal/user/AccountFormController.php
@@ -113,8 +113,15 @@ public function form(array $form, array &$form_state) {
       if (!$pass_reset) {
         $protected_values['mail'] = $form['account']['mail']['#title'];
         $protected_values['pass'] = $this->t('Password');
-        $request_new = l($this->t('Request new password'), 'user/password', array('attributes' => array('title' => $this->t('Request new password via e-mail.'))));
-        $current_pass_description = $this->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($this->t('Reset your password'), 'user/password',
+          array('attributes' => array('title' => $this->t('Send password reset instructions via e-mail.')))
+        );
+        $current_pass_description = $this->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)
+        );
       }
 
       // The user must enter their current password to change to a new one.
diff --git a/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php b/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php
index 2399a58..7ab6fdc 100644
--- a/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php
+++ b/core/modules/user/lib/Drupal/user/Form/UserPasswordForm.php
@@ -90,15 +90,20 @@ public function buildForm(array $form, array &$form_state) {
       $form['name']['#value'] = $user->getEmail();
       $form['mail'] = array(
         '#prefix' => '<p>',
-        '#markup' =>  $this->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->getEmail())),
+        '#markup' => $this->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->getEmail())),
         '#suffix' => '</p>',
       );
     }
     else {
+      $form['mail'] = array(
+        '#prefix' => '<p>',
+        '#markup' => $this->t('Password reset instructions will be sent to your registered e-mail address.'),
+        '#suffix' => '</p>',
+      );
       $form['name']['#default_value'] = $this->getRequest()->query->get('name');
     }
     $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array('#type' => 'submit', '#value' => $this->t('E-mail new password'));
+    $form['actions']['submit'] = array('#type' => 'submit', '#value' => $this->t('Submit'));
 
     return $form;
   }
diff --git a/core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php b/core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php
index c087889..e242ad5 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Block/UserLoginBlock.php
@@ -49,9 +49,9 @@ public function build() {
         ),
       ));
     }
-    $items['request_password'] = l(t('Request new password'), 'user/password', array(
+    $items['request_password'] = l(t('Reset your password'), 'user/password', array(
       'attributes' => array(
-        'title' => t('Request new password via e-mail.'),
+        'title' => t('Send password reset instructions via e-mail.'),
         'class' => array('request-password-link'),
       ),
     ));
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php b/core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php
index 24e7244..c739ef4 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserAccountLinksTests.php
@@ -124,7 +124,7 @@ function testAccountPageTitles() {
     $this->assertTitle('Create new account' . $title_suffix, "Page title of /user/register is 'Create new account' for anonymous users.");
 
     $this->drupalGet('user/password');
-    $this->assertTitle('Request new password' . $title_suffix, "Page title of /user/register is 'Request new password' for anonymous users.");
+    $this->assertTitle('Reset your password' . $title_suffix, "Page title of /user/register is 'Reset your password' for anonymous users.");
 
     // Check the page title for registered users is "My Account" in menus.
     $this->drupalLogin($this->drupalCreateUser());
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserPasswordResetTest.php b/core/modules/user/lib/Drupal/user/Tests/UserPasswordResetTest.php
index f8635fd..c1222b9 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserPasswordResetTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserPasswordResetTest.php
@@ -57,14 +57,14 @@ function testUserPasswordReset() {
     $this->drupalGet('user/password');
 
     $edit = array('name' => $this->randomName(32));
-    $this->drupalPostForm(NULL, $edit, t('E-mail new password'));
+    $this->drupalPostForm(NULL, $edit, t('Submit'));
 
     $this->assertText(t('Sorry, @name is not recognized as a username or an e-mail address.', array('@name' => $edit['name'])), 'Validation error message shown when trying to request password for invalid account.');
     $this->assertEqual(count($this->drupalGetMails(array('id' => 'user_password_reset'))), 0, 'No e-mail was sent when requesting a password for an invalid account.');
 
     // Reset the password by username via the password reset page.
     $edit['name'] = $this->account->getUsername();
-    $this->drupalPostForm(NULL, $edit, t('E-mail new password'));
+    $this->drupalPostForm(NULL, $edit, t('Submit'));
 
      // Verify that the user was sent an e-mail.
     $this->assertMail('to', $this->account->getEmail(), 'Password e-mail sent to user.');
@@ -93,7 +93,7 @@ function testUserPasswordReset() {
     // Count email messages before to compare with after.
     $before = count($this->drupalGetMails(array('id' => 'user_password_reset')));
     $edit['name'] = $this->account->getEmail();
-    $this->drupalPostForm(NULL, $edit, t('E-mail new password'));
+    $this->drupalPostForm(NULL, $edit, t('Submit'));
     $this->assertTrue( count($this->drupalGetMails(array('id' => 'user_password_reset'))) === $before + 1, 'E-mail sent when requesting password reset using e-mail address.');
 
     // Create a password reset link as if the request time was 60 seconds older than the allowed limit.
diff --git a/core/modules/user/user.local_tasks.yml b/core/modules/user/user.local_tasks.yml
index c418f0b..694b2fb 100644
--- a/core/modules/user/user.local_tasks.yml
+++ b/core/modules/user/user.local_tasks.yml
@@ -25,7 +25,7 @@ user.register:
 user.pass:
   route_name: user.pass
   tab_root_id: user.page
-  title: 'Request new password'
+  title: 'Reset your password'
 # Other authentication methods may add pages below user/login/.
 user.login:
   route_name: user.login
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 5751f02..8f67301 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -931,7 +931,7 @@ function user_menu_title() {
       case 'user/register' :
         return t('Create new account');
       case 'user/password' :
-        return t('Request new password');
+        return t('Reset your password');
       default :
         return t('User account');
     }
diff --git a/core/modules/user/user.routing.yml b/core/modules/user/user.routing.yml
index bbc2053..3add4b9 100644
--- a/core/modules/user/user.routing.yml
+++ b/core/modules/user/user.routing.yml
@@ -118,7 +118,7 @@ user.pass:
   path: '/user/password'
   defaults:
     _form: '\Drupal\user\Form\UserPasswordForm'
-    _title: 'Request new password'
+    _title: 'Reset your password'
   requirements:
     _access: 'TRUE'