diff --git a/core/modules/user/lib/Drupal/user/Tests/UserPasswordResetTest.php b/core/modules/user/lib/Drupal/user/Tests/UserPasswordResetTest.php
index 97390c7..f0a49af 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserPasswordResetTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserPasswordResetTest.php
@@ -83,6 +83,10 @@ function testUserPasswordReset() {
     $this->assertLink(t('Log out'));
     $this->assertTitle(t('@name | @site', array('@name' => $this->account->getUsername(), '@site' => config('system.site')->get('name'))), 'Logged in using password reset link.');
 
+    // Revisit the reset password link as authenicated user
+    $this->drupalGet($resetURL);
+    $this->assertText('in order to initiate a password change via an email link');
+
     // Log out, and try to log in again using the same one-time link.
     $this->drupalLogout();
     $this->drupalGet($resetURL);
diff --git a/core/modules/user/user.pages.inc b/core/modules/user/user.pages.inc
index 04bd69c..d358a2f 100644
--- a/core/modules/user/user.pages.inc
+++ b/core/modules/user/user.pages.inc
@@ -22,7 +22,7 @@ function user_pass_reset($form, &$form_state, $uid, $timestamp, $hashed_pass, $a
   if ($user->isAuthenticated()) {
     // The existing user is already logged in.
     if ($user->id() == $uid) {
-      drupal_set_message(t('You are logged in as %user. <a href="!user_edit">Change your password.</a>', array('%user' => $user->getUsername(), '!user_edit' => url("user/" . $user->id() . "/edit"))));
+      drupal_set_message(t('You are logged in as %user. You need to be <a href="!logout">logged out</a> in order to initiate a password change via an email link. After <a href="!logout">logging out</a>, go back to your email and click on the log-in link again there.', array('%user' => $user->getUsername(), '!logout' => url('user/logout'))), 'warning');
     }
     // A different user is already logged in on the computer.
     else {