diff --git a/app/templates/base.html b/app/templates/base.html
index 7406a33..ee5874b 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -28,10 +28,19 @@
       {{ item.label }}
     </a>
     {% endfor %}
-    <div class="ml-auto">
-      <button class="text-white text-sm px-4 py-1.5 rounded border border-white/40 bg-white/15 hover:bg-white/25">
-        Anmelden
-      </button>
+    <div class="ml-auto flex items-center gap-3">
+      {% if current_user | default(None) %}
+        <span class="text-white/85 text-sm">{{ current_user.username }}</span>
+        <a href="/auth/logout"
+           class="text-white text-sm px-4 py-1.5 rounded border border-white/40 bg-white/15 hover:bg-white/25">
+          Abmelden
+        </a>
+      {% else %}
+        <a href="/auth/login"
+           class="text-white text-sm px-4 py-1.5 rounded border border-white/40 bg-white/15 hover:bg-white/25">
+          Anmelden
+        </a>
+      {% endif %}
     </div>
   </nav>
 
@@ -46,4 +55,4 @@
   </footer>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/test_landing.py b/tests/test_landing.py
index 57498f4..1266d91 100644
--- a/tests/test_landing.py
+++ b/tests/test_landing.py
@@ -77,3 +77,16 @@ def test_landing_contains_title(client):
 def test_landing_info_strip_shows_db_mode(client, auth_cookies):
     response = client.get("/", cookies=auth_cookies)
     assert "SQLite" in response.text or "MariaDB" in response.text
+
+
+def test_navbar_shows_login_button_for_anonymous(client):
+    response = client.get("/")
+    assert "Anmelden" in response.text
+    assert "Abmelden" not in response.text
+
+
+def test_navbar_shows_username_and_logout_when_logged_in(client, auth_cookies):
+    response = client.get("/", cookies=auth_cookies)
+    assert "testuser" in response.text
+    assert "Abmelden" in response.text
+    assert "Anmelden" not in response.text