diff --git a/mandelstudio/templates/oxyan/headers/partials/carbasa-user-bar.html b/mandelstudio/templates/oxyan/headers/partials/carbasa-user-bar.html
index 6bde637..c6a9b72 100644
--- a/mandelstudio/templates/oxyan/headers/partials/carbasa-user-bar.html
+++ b/mandelstudio/templates/oxyan/headers/partials/carbasa-user-bar.html
@@ -1,7 +1,9 @@
 {% load i18n localized_navigation %}
 
 <div class="header-right">
+    {% get_current_language as current_language %}
     {% get_available_languages as available_languages %}
+    {% get_language_info_list for available_languages as languages %}
     {% request_language_options as language_options %}
 
     <div class="dropdown language-dropdown me-2">
@@ -27,12 +29,16 @@
         </button>
         <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="header-language-switcher">
             {% for option in language_options %}
-                <li>
-                    <a class="dropdown-item d-flex align-items-center gap-2" href="{{ option.url }}">
-                        {% include "oxyan/partials/flags/"|add:option.code|add:".svg" %}
-                        <span>{{ option.label|title }}</span>
-                    </a>
-                </li>
+                {% for language in languages %}
+                    {% if language.code == option.code %}
+                        <li>
+                            <a class="dropdown-item d-flex align-items-center gap-2" href="{{ option.url }}">
+                                {% include "oxyan/partials/flags/"|add:language.code|add:".svg" %}
+                                <span>{{ language.name_local|title }}</span>
+                            </a>
+                        </li>
+                    {% endif %}
+                {% endfor %}
             {% endfor %}
         </ul>
     </div>
diff --git a/mandelstudio/templatetags/localized_navigation.py b/mandelstudio/templatetags/localized_navigation.py
index baac596..2af5d7d 100644
--- a/mandelstudio/templatetags/localized_navigation.py
+++ b/mandelstudio/templatetags/localized_navigation.py
@@ -141,13 +141,10 @@ def page_language_options(page):
 
 @register.simple_tag(takes_context=True)
 def request_language_options(context):
-    try:
-        page = context.get("page") or context.get("self")
-        if page is None:
-            page = _resolve_page_from_request(context.get("request"))
-        return page_language_options(page)
-    except Exception:
-        return page_language_options(None)
+    page = context.get("page") or context.get("self")
+    if page is None:
+        page = _resolve_page_from_request(context.get("request"))
+    return page_language_options(page)
 
 
 @register.simple_tag(takes_context=True)