diff --git a/web/themes/custom/geofresco/src/templates/layout/page.html.twig b/web/themes/custom/geofresco/src/templates/layout/page.html.twig
index 4803ca0..4da50d1 100644
--- a/web/themes/custom/geofresco/src/templates/layout/page.html.twig
+++ b/web/themes/custom/geofresco/src/templates/layout/page.html.twig
@@ -30,11 +30,6 @@
         {{ page.header_search }}
       </div>
       {% endif %}
-      {% if page.header_user %}
-      <div class="user-account-menu column is-narrow">
-        {{ page.header_user }}
-      </div>
-      {% endif %}
       {% block navbar_social %}
       {% if page.navbar_social %}
       <div class="column is-narrow">
@@ -130,7 +125,7 @@
 </section>
 {% endblock main %}
 {% block footer %}
-{% if page.footer or page.footer_menus or page.footer_info or page.footer_notice%}
+{% if page.footer or page.footer_menus or page.footer_info or page.footer_notice or page.header_user %}
   <footer role="contentinfo" class="footer">
     <div class="container">
       {{ page.footer }}
@@ -139,8 +134,14 @@
           {{ page.footer_menus }}
         {% endif %}
         {% if page.footer_info %}
-          <div class="column"></div>
-          {{ page.footer_info }}
+          <div class="column">
+            {{ page.footer_info }}
+          </div>
+        {% endif %}
+        {% if page.header_user %}
+          <div class="user-account-menu column is-narrow">
+            {{ page.header_user }}
+          </div>
         {% endif %}
       </div>
       {% if page.footer_notice %}