diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 30aaf1bfd..9ac0f2549 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -533,6 +533,14 @@ header {
   }
 }
 
+.top-bar-right {
+
+  .active {
+    font-weight: bold;
+    text-decoration: underline;
+  }
+}
+
 .submenu {
   border-bottom: 1px solid $border;
   clear: both;
diff --git a/app/views/devise/menu/_login_items.html.erb b/app/views/devise/menu/_login_items.html.erb
index ea2c6a44c..ac2f7e33c 100644
--- a/app/views/devise/menu/_login_items.html.erb
+++ b/app/views/devise/menu/_login_items.html.erb
@@ -12,12 +12,20 @@
     <% end %>
   </li>
   <li>
-    <%= link_to t("layouts.header.my_activity_link"),
-                user_path(current_user), rel: "nofollow" %>
+    <%= layout_menu_link_to t("layouts.header.my_activity_link"),
+                              user_path(current_user),
+                              controller_name == 'users',
+                              rel: "nofollow",
+                              title: t("shared.go_to_page") +
+                                     t("layouts.header.my_activity_link") %>
   </li>
   <li>
-    <%= link_to t("layouts.header.my_account_link"),
-                account_path, rel: "nofollow" %>
+    <%= layout_menu_link_to t("layouts.header.my_account_link"),
+                              account_path,
+                              controller_name == 'account',
+                              rel: "nofollow",
+                              title: t("shared.go_to_page") +
+                                     t("layouts.header.my_account_link") %>
   </li>
   <li>
     <%= link_to t("devise_views.menu.login_items.logout"),