diff --git a/app/views/layouts/_lte_admin_navbar.html.erb b/app/views/layouts/_lte_admin_navbar.html.erb
index be68d89385..5b46468b86 100644
--- a/app/views/layouts/_lte_admin_navbar.html.erb
+++ b/app/views/layouts/_lte_admin_navbar.html.erb
@@ -2,11 +2,19 @@
   <a class="nav-link" data-bs-toggle="dropdown" href="#">
     <%= current_user.display_name %>
   </a>
+
   <div class="dropdown-menu dropdown-menu-lg dropdown-menu-right">
-    <%= link_to "Switch To: to be implemented", "#", class:"dropdown-item" %>
+    <% current_user.switchable_roles.each do |role| %>
+      <% next if role == current_role %>
+      <%= link_to switch_to_role_users_path(role_id: role.id), class:"dropdown-item" do %>
+        <i class="fa fa-repeat text-aqua"></i><%= "Switch to: #{role.resource&.name || "Super Admin"}" %>
+      <% end %>
+    <% end %>
+
     <div class="dropdown-divider"></div>
+
     <%= link_to destroy_user_session_path, class:"dropdown-item dropdown-footer", method: :delete do %>
-    <i class="fa fa-sign-out mr-2"></i> Log Out
+      <i class="fa fa-sign-out mr-2"></i> Log Out
     <% end %>
   </div>
-</li>
\ No newline at end of file
+</li>
diff --git a/app/views/layouts/_lte_navbar.html.erb b/app/views/layouts/_lte_navbar.html.erb
index 006889d397..f90c40914d 100644
--- a/app/views/layouts/_lte_navbar.html.erb
+++ b/app/views/layouts/_lte_navbar.html.erb
@@ -69,7 +69,7 @@
     <% current_user.switchable_roles.each do |role| %>
       <% next if role == current_role %>
       <%= link_to switch_to_role_users_path(role_id: role.id), class:"dropdown-item" do %>
-        <i class="fa fa-repeat text-aqua"></i><%= "Switch to: #{role.resource.name}" %>
+        <i class="fa fa-repeat text-aqua"></i><%= "Switch to: #{role.resource&.name || "Super Admin"}" %>
       <% end %>
     <% end %>
     <% if current_organization.id.present? &&