diff --git a/templates/empty.tpl b/templates/empty.tpl
index f7fd2b3..6b425a7 100644
--- a/templates/empty.tpl
+++ b/templates/empty.tpl
@@ -34,9 +34,11 @@
   <header class="p-3 mb-3 border-bottom">
     <div class="container">
       <div class="d-flex flex-wrap align-items-center justify-content-center justify-content-lg-start">
+        {block name="navbar-brand"}
         <a href="/" class="d-flex align-items-center mb-2 mb-lg-0 text-dark text-decoration-none">
           <img id="logo" src="{static_url path="images/logo.svg"}" alt="Logo" title="Logo"/>
         </a>
+        {/block}
 
         <ul class="pr-2 nav col-12 col-lg-auto me-lg-auto mb-2 justify-content-center mb-md-0">
           {block name="navbar-menu"}
@@ -45,22 +47,28 @@
 
         {block name="navbar-extra-content"}{/block}
 
+        {block name="navbar-user"}
         {if isset($auth_user) && $auth_user}
         <div class="dropdown text-end">
+          {block name="navbar-user-name"}
           <a href="#" class="d-block link-dark text-decoration-none dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
             <i class="fa fa-user-circle" aria-hidden="true"></i>
             {$auth_user->name|escape:"htmlall"}
           </a>
+          {/block}
+          {block name="navbar-user-menu"}
           <ul class="dropdown-menu text-small">
-            {block name="navbar-user-menu"}{/block}
+            {block name="navbar-user-menu-content"}{/block}
             <li>
               <a class="dropdown-item" href="logout">
                 <i class="fas fa-sign-out-alt"></i> {t domain=$CORE_TEXT_DOMAIN}Sign out{/t}
               </a>
             </li>
           </ul>
+          {/block}
         </div>
         {/if}
+        {/block}
       </div>
     </div>
   </header>