diff --git a/core/modules/menu_ui/src/MenuForm.php b/core/modules/menu_ui/src/MenuForm.php
index c23e514..10dcf74 100644
--- a/core/modules/menu_ui/src/MenuForm.php
+++ b/core/modules/menu_ui/src/MenuForm.php
@@ -224,7 +224,6 @@ protected function buildOverviewForm(array &$form, FormStateInterface $form_stat
       array('callable' => 'menu.default_tree_manipulators:generateIndexAndSort'),
     );
     $tree = $this->menuTree->transform($tree, $manipulators);
-    $this->getRequest()->attributes->set('_menu_admin', FALSE);
 
     // Determine the delta; the number of weights to be made available.
     $count = function(array $tree) {
@@ -277,6 +276,7 @@ protected function buildOverviewForm(array &$form, FormStateInterface $form_stat
       ]),
     ]);
     $links = $this->buildOverviewTreeForm($tree, $delta);
+    $this->getRequest()->attributes->set('_menu_admin', FALSE);
     foreach (Element::children($links) as $id) {
       if (isset($links[$id]['#item'])) {
         $element = $links[$id];
@@ -350,14 +350,6 @@ protected function buildOverviewTreeForm($tree, $delta) {
         if (!$link->isEnabled()) {
           $form[$id]['title']['#suffix'] = ' (' . $this->t('disabled') . ')';
         }
-        // @todo Remove this in https://www.drupal.org/node/2568785.
-        elseif ($id === 'menu_plugin_id:user.logout') {
-          $form[$id]['title']['#suffix'] = ' (' . $this->t('<q>Log in</q> for anonymous users') . ')';
-        }
-        // @todo Remove this in https://www.drupal.org/node/2568785.
-        elseif (($url = $link->getUrlObject()) && $url->isRouted() && $url->getRouteName() == 'user.page') {
-          $form[$id]['title']['#suffix'] = ' (' . $this->t('logged in users only') . ')';
-        }
 
         $form[$id]['enabled'] = array(
           '#type' => 'checkbox',
diff --git a/core/modules/user/src/Plugin/Menu/LoginLogoutMenuLink.php b/core/modules/user/src/Plugin/Menu/LoginLogoutMenuLink.php
index 55821e0..2403cef 100644
--- a/core/modules/user/src/Plugin/Menu/LoginLogoutMenuLink.php
+++ b/core/modules/user/src/Plugin/Menu/LoginLogoutMenuLink.php
@@ -6,6 +6,7 @@
 use Drupal\Core\Menu\StaticMenuLinkOverridesInterface;
 use Drupal\Core\Session\AccountInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * A menu link that shows "Log in" or "Log out" as appropriate.
@@ -20,6 +21,13 @@ class LoginLogoutMenuLink extends MenuLinkDefault {
   protected $currentUser;
 
   /**
+   * The request stack.
+   *
+   * @var \Symfony\Component\HttpFoundation\RequestStack
+   */
+  protected $requestStack;
+
+  /**
    * Constructs a new LoginLogoutMenuLink.
    *
    * @param array $configuration
@@ -33,10 +41,11 @@ class LoginLogoutMenuLink extends MenuLinkDefault {
    * @param \Drupal\Core\Session\AccountInterface $current_user
    *   The current user.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, StaticMenuLinkOverridesInterface $static_override, AccountInterface $current_user) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, StaticMenuLinkOverridesInterface $static_override, AccountInterface $current_user, RequestStack $request_stack) {
     parent::__construct($configuration, $plugin_id, $plugin_definition, $static_override);
 
     $this->currentUser = $current_user;
+    $this->requestStack = $request_stack;
   }
 
   /**
@@ -48,7 +57,8 @@ public static function create(ContainerInterface $container, array $configuratio
       $plugin_id,
       $plugin_definition,
       $container->get('menu_link.static.overrides'),
-      $container->get('current_user')
+      $container->get('current_user'),
+      $container->get('request_stack')
     );
   }
 
@@ -56,7 +66,10 @@ public static function create(ContainerInterface $container, array $configuratio
    * {@inheritdoc}
    */
   public function getTitle() {
-    if ($this->currentUser->isAuthenticated()) {
+    if ($this->requestStack->getCurrentRequest()->attributes->get('_menu_admin', FALSE)) {
+      return $this->t('Log out') . ' (' . $this->t('<q>Log in</q> for anonymous users') . ')';
+    }
+    elseif ($this->currentUser->isAuthenticated()) {
       return $this->t('Log out');
     }
     else {
diff --git a/core/modules/user/src/Plugin/Menu/UserPageMenuLink.php b/core/modules/user/src/Plugin/Menu/UserPageMenuLink.php
new file mode 100644
index 0000000..378fb71
--- /dev/null
+++ b/core/modules/user/src/Plugin/Menu/UserPageMenuLink.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Drupal\user\Plugin\Menu;
+
+use Drupal\Core\Menu\MenuLinkDefault;
+use Drupal\Core\Menu\StaticMenuLinkOverridesInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+class UserPageMenuLink extends MenuLinkDefault {
+
+  /**
+   * The request stack.
+   *
+   * @var \Symfony\Component\HttpFoundation\RequestStack
+   */
+  protected $requestStack;
+
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, StaticMenuLinkOverridesInterface $static_override, RequestStack $request_stack) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $static_override);
+
+    $this->requestStack = $request_stack;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('menu_link.static.overrides'),
+      $container->get('request_stack')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getTitle() {
+    $title = parent::getTitle();
+
+    if ($this->requestStack->getCurrentRequest()->attributes->get('_menu_admin', FALSE)) {
+      $title .= ' (' . $this->t('logged in users only') . ')';
+    }
+    return $title;
+  }
+
+}
diff --git a/core/modules/user/user.links.menu.yml b/core/modules/user/user.links.menu.yml
index bceb59b..9c3bfcf 100644
--- a/core/modules/user/user.links.menu.yml
+++ b/core/modules/user/user.links.menu.yml
@@ -1,6 +1,7 @@
 user.page:
   title: 'My account'
   weight: -10
+  class: Drupal\user\Plugin\Menu\UserPageMenuLink
   route_name: user.page
   menu_name: account
 user.logout: