diff --git a/templates/layout_admin.html.twig b/templates/layout_admin.html.twig
index aa8bb85..f3aac93 100644
--- a/templates/layout_admin.html.twig
+++ b/templates/layout_admin.html.twig
@@ -1,9 +1,10 @@
 {% extends 'base_admin.html.twig' %}
 
 {% block body %}
+    {% set main_menu = is_granted('ROLE_ADMIN') ? 'admin_main' : 'groups_main' %}
     <div class="max-w-screen-2xl mx-auto px-4 lg:px-8 lg:grid lg:grid-cols-4 gap-8 py-8">
         <div class="lg:col-span-4 flex items-center justify-between pb-4 lg:pb-0">
-            <a href="{{ path(app.user ? 'app_admin_dashboard' : 'app_security_login') }}">
+            <a href="{{ path(app.user ? 'app_admin_dashboard' : 'app_login') }}">
                 <img class="h-8 w-auto" src="{{ asset('build/images/logo_ep.svg') }}" alt="My E&amp;P Admin">
             </a>
             {% if app.user %}
@@ -18,7 +19,9 @@
             {% endif %}
         </div>
         <div class="hidden lg:block sticky top-0 h-screen">
-            {{ knp_menu_render(knp_menu_get('admin_main')) }}
+            {% if app.user %}
+                {{ knp_menu_render(knp_menu_get(main_menu)) }}
+            {% endif %}
         </div>
         <div class="lg:col-span-3">
             {% block content %}{% endblock %}
@@ -37,10 +40,8 @@
                 </button>
             </div>
             <div class="w-full h-full p-8 pt-0 overflow-y-scroll">
-                {% if is_granted('ROLE_ADMIN') %}
-                    {{ knp_menu_render(knp_menu_get('admin_main')) }}
-                {% elseif is_granted('ROLE_GROUPS_MANAGER') %}
-                    {{ knp_menu_render(knp_menu_get('groups_main')) }}
+                {% if app.user %}
+                    {{ knp_menu_render(knp_menu_get(main_menu)) }}
                 {% endif %}
             </div>
         </div>