diff --git a/app/components/layout/account_menu_component.html.erb b/app/components/layout/account_menu_component.html.erb
index 240ce2842..7c6875c84 100644
--- a/app/components/layout/account_menu_component.html.erb
+++ b/app/components/layout/account_menu_component.html.erb
@@ -1,5 +1,5 @@
 <ul class="menu" data-responsive-menu="medium-dropdown">
-  <%= render "shared/admin_login_items", current_user: user %>
+  <%= render Layout::AdminLoginItemsComponent.new(user) %>
   <%= render Layout::NotificationItemComponent.new(user) %>
-  <%= render "devise/menu/login_items", current_user: user %>
+  <%= render Layout::LoginItemsComponent.new(user) %>
 </ul>
diff --git a/app/components/layout/admin_login_items_component.html.erb b/app/components/layout/admin_login_items_component.html.erb
new file mode 100644
index 000000000..b5690e98a
--- /dev/null
+++ b/app/components/layout/admin_login_items_component.html.erb
@@ -0,0 +1,41 @@
+<li class="has-submenu">
+  <%= link_to t("layouts.header.administration_menu"), "#", rel: "nofollow", class: "hide-for-small-only" %>
+  <ul class="submenu menu" data-submenu>
+    <% if user.administrator? %>
+      <li>
+        <%= link_to t("layouts.header.administration"), admin_root_path %>
+      </li>
+    <% end %>
+
+    <% if user.administrator? || user.moderator? %>
+      <li>
+        <%= link_to t("layouts.header.moderation"), moderation_root_path %>
+      </li>
+    <% end %>
+
+    <% if feature?(:budgets) &&
+          (user.administrator? || user.valuator?) %>
+      <li>
+        <%= link_to t("layouts.header.valuation"), valuation_root_path %>
+      </li>
+    <% end %>
+
+    <% if user.administrator? || user.manager? %>
+      <li>
+        <%= link_to t("layouts.header.management"), management_sign_in_path %>
+      </li>
+    <% end %>
+
+    <% if user.poll_officer? && Poll.current.any? %>
+      <li>
+        <%= link_to t("layouts.header.officing"), officing_root_path %>
+      </li>
+    <% end %>
+
+    <% if feature?(:sdg) && (user.administrator? || user.sdg_manager?) %>
+      <li>
+        <%= link_to t("sdg_management.header.title"), sdg_management_root_path %>
+      </li>
+    <% end %>
+  </ul>
+</li>
diff --git a/app/components/layout/admin_login_items_component.rb b/app/components/layout/admin_login_items_component.rb
new file mode 100644
index 000000000..3c7a67950
--- /dev/null
+++ b/app/components/layout/admin_login_items_component.rb
@@ -0,0 +1,12 @@
+class Layout::AdminLoginItemsComponent < ApplicationComponent
+  attr_reader :user
+  delegate :show_admin_menu?, to: :helpers
+
+  def initialize(user)
+    @user = user
+  end
+
+  def render?
+    show_admin_menu?(user)
+  end
+end
diff --git a/app/views/devise/menu/_login_items.html.erb b/app/components/layout/login_items_component.html.erb
similarity index 93%
rename from app/views/devise/menu/_login_items.html.erb
rename to app/components/layout/login_items_component.html.erb
index f5cd59fa9..b2acca46e 100644
--- a/app/views/devise/menu/_login_items.html.erb
+++ b/app/components/layout/login_items_component.html.erb
@@ -1,7 +1,7 @@
-<% if current_user %>
+<% if user %>
   <li>
     <%= layout_menu_link_to t("layouts.header.my_activity_link"),
-                              user_path(current_user),
+                              user_path(user),
                               controller_name == "users",
                               rel: "nofollow",
                               title: t("shared.go_to_page") +
diff --git a/app/components/layout/login_items_component.rb b/app/components/layout/login_items_component.rb
new file mode 100644
index 000000000..3ee4e6ee0
--- /dev/null
+++ b/app/components/layout/login_items_component.rb
@@ -0,0 +1,8 @@
+class Layout::LoginItemsComponent < ApplicationComponent
+  attr_reader :user
+  delegate :layout_menu_link_to, to: :helpers
+
+  def initialize(user)
+    @user = user
+  end
+end
diff --git a/app/views/shared/_admin_login_items.html.erb b/app/views/shared/_admin_login_items.html.erb
deleted file mode 100644
index 99b03c5cf..000000000
--- a/app/views/shared/_admin_login_items.html.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-<% if show_admin_menu?(current_user) %>
-  <li class="has-submenu">
-    <%= link_to t("layouts.header.administration_menu"), "#", rel: "nofollow", class: "hide-for-small-only" %>
-    <ul class="submenu menu" data-submenu>
-      <% if current_user.administrator? %>
-        <li>
-          <%= link_to t("layouts.header.administration"), admin_root_path %>
-        </li>
-      <% end %>
-
-      <% if current_user.administrator? || current_user.moderator? %>
-        <li>
-          <%= link_to t("layouts.header.moderation"), moderation_root_path %>
-        </li>
-      <% end %>
-
-      <% if feature?(:budgets) &&
-            (current_user.administrator? || current_user.valuator?) %>
-        <li>
-          <%= link_to t("layouts.header.valuation"), valuation_root_path %>
-        </li>
-      <% end %>
-
-      <% if current_user.administrator? || current_user.manager? %>
-        <li>
-          <%= link_to t("layouts.header.management"), management_sign_in_path %>
-        </li>
-      <% end %>
-
-      <% if current_user.poll_officer? && Poll.current.any? %>
-        <li>
-          <%= link_to t("layouts.header.officing"), officing_root_path %>
-        </li>
-      <% end %>
-
-      <% if feature?(:sdg) && (current_user.administrator? || current_user.sdg_manager?) %>
-        <li>
-          <%= link_to t("sdg_management.header.title"), sdg_management_root_path %>
-        </li>
-      <% end %>
-    </ul>
-  </li>
-<% end %>