diff --git a/Theme/Argon/includes/header.twig b/Theme/Argon/includes/header.twig
index 2eb2691..8fb4283 100644
--- a/Theme/Argon/includes/header.twig
+++ b/Theme/Argon/includes/header.twig
@@ -61,6 +61,7 @@
                         </a>
                     </li>
 
+                    {% if current_user() %}
                     <li class="nav-item dropdown d-flex align-items-start">
                         <a href="javascript:;" style="margin-right: 10px;" class="nav-link text-white p-0" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-expanded="false">
                             <i class="fa fa-user cursor-pointer" style="margin-right: 3px;"></i> <span class="d-sm-inline d-none">{{ trans("hello", {'%name%': current_user().name}) }}</span>
@@ -94,7 +95,7 @@
                                     </div>
                                 </a>
                             </li>
-                    {% if current_user() and current_user().confirmed() %}
+                    {% if current_user().confirmed() %}
 
                             <li class="mb-2">
                                 <a class="dropdown-item border-radius-md" href="{{ path('account.emails') }}">
@@ -128,6 +129,8 @@
                             </li>
                         </ul>
                     </li>
+                    
+                    {% endif %}
                     {% if setting('disabled_changelocale') != 'true' %}
                     <li class="nav-item dropdown pe-2 d-flex align-items-start" style="margin-left: 10px;">
                         <a href="javascript:;" class="nav-link text-white p-0" id="dropdownLocale" data-bs-toggle="dropdown" aria-expanded="false">