diff --git a/layouts/_partials/custom/head-end.html b/layouts/_partials/custom/head-end.html
new file mode 100644
index 0000000..d3305b5
--- /dev/null
+++ b/layouts/_partials/custom/head-end.html
@@ -0,0 +1,4 @@
+{{/* RAPPORT — auf allen Seiten geladen (überschreibt Theme-Default).
+     Passt Navbar/CTAs an den Login-Status an: eingeloggter Kunde sieht
+     "Mein Konto" statt "Anmelden"/"Jetzt starten". */}}
+<script defer src="/js/nav-account.js"></script>
diff --git a/public/admin/index.html b/public/admin/index.html
index 408e64c..6c5490c 100644
--- a/public/admin/index.html
+++ b/public/admin/index.html
@@ -49,7 +49,9 @@
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/agb/index.html b/public/agb/index.html
index 08ad972..051ab03 100644
--- a/public/agb/index.html
+++ b/public/agb/index.html
@@ -70,7 +70,9 @@ Limits (Benutzer, Projekte, Speicher) richten sich nach dem gewählten Plan.
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/categories/index.html b/public/categories/index.html
index 7272f63..7d45e28 100644
--- a/public/categories/index.html
+++ b/public/categories/index.html
@@ -47,7 +47,9 @@
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/datenschutz/index.html b/public/datenschutz/index.html
index 63d895b..6a10853 100644
--- a/public/datenschutz/index.html
+++ b/public/datenschutz/index.html
@@ -74,7 +74,9 @@ Zahlungsdaten: Die Zahlungsabwicklung erfolgt über Stripe. Wir speichern keine
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/docs/arbeitsablauf/index.html b/public/docs/arbeitsablauf/index.html
index 7c58e9f..1b932d1 100644
--- a/public/docs/arbeitsablauf/index.html
+++ b/public/docs/arbeitsablauf/index.html
@@ -68,7 +68,9 @@
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/docs/changelog/index.html b/public/docs/changelog/index.html
index ba9cc31..50914f1 100644
--- a/public/docs/changelog/index.html
+++ b/public/docs/changelog/index.html
@@ -81,7 +81,9 @@ Builds sind Tauri-signiert, aber noch nicht Apple-notarisiert — siehe Installa
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/docs/datenhaltung/index.html b/public/docs/datenhaltung/index.html
index 9f46857..e35db35 100644
--- a/public/docs/datenhaltung/index.html
+++ b/public/docs/datenhaltung/index.html
@@ -76,7 +76,9 @@ macOS ~/Library/Application Support/com.rapport.app/ Dort liegt eine einzelne lo
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/docs/einrichtung/index.html b/public/docs/einrichtung/index.html
index beb95ff..1689598 100644
--- a/public/docs/einrichtung/index.html
+++ b/public/docs/einrichtung/index.html
@@ -73,7 +73,9 @@ Reihenfolge Die Reihenfolge ist wichtig — jede Stufe baut auf der vorherigen a
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/docs/entwicklung/index.html b/public/docs/entwicklung/index.html
index 9c07413..7ee9865 100644
--- a/public/docs/entwicklung/index.html
+++ b/public/docs/entwicklung/index.html
@@ -139,7 +139,9 @@ macOS: Xcode Command Line Tools (xcode-select --install) Windows: Microsoft C
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/docs/erste-schritte/index.html b/public/docs/erste-schritte/index.html
index 2d60099..69f276e 100644
--- a/public/docs/erste-schritte/index.html
+++ b/public/docs/erste-schritte/index.html
@@ -61,7 +61,9 @@ Die Pre-Release-Builds sind signiert über Tauri, aber (noch) nicht über die Ap
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/docs/index.html b/public/docs/index.html
index 71f212f..2892738 100644
--- a/public/docs/index.html
+++ b/public/docs/index.html
@@ -51,7 +51,9 @@ Erste Schritte Quick-StartIn sechs Schritten von Null zur ersten Rechnung. Insta
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/docs/installation/index.html b/public/docs/installation/index.html
index c91881e..19c8410 100644
--- a/public/docs/installation/index.html
+++ b/public/docs/installation/index.html
@@ -88,7 +88,9 @@ Voraussetzungen Plattform Status Versionen macOS Apple Silicon (M1 – M4) ✅ U
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/docs/troubleshooting/index.html b/public/docs/troubleshooting/index.html
index 3afae88..0dbf5cd 100644
--- a/public/docs/troubleshooting/index.html
+++ b/public/docs/troubleshooting/index.html
@@ -76,7 +76,9 @@ xattr -d com.apple.quarantine /Applications/Rapport.app App startet, zeigt aber
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/docs/web-modus/index.html b/public/docs/web-modus/index.html
index 5e48632..0d5efaa 100644
--- a/public/docs/web-modus/index.html
+++ b/public/docs/web-modus/index.html
@@ -111,7 +111,9 @@ Wann brauchst du das? Anwendungsfall Empfehlung Solo-Büro, ein Mac Desktop-App
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/downloads/index.html b/public/downloads/index.html
index 88d7a89..6e195ce 100644
--- a/public/downloads/index.html
+++ b/public/downloads/index.html
@@ -60,7 +60,9 @@ macOS Architektur Download Apple Silicon (M1–M4) RAPPORT_0.8.2_aarch64.dmg Int
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/faq/index.html b/public/faq/index.html
index 36dcbfc..c58d922 100644
--- a/public/faq/index.html
+++ b/public/faq/index.html
@@ -54,7 +54,9 @@ Ist Rapport kostenlos? Ja, vollständig. Quellcode unter GNU AGPL-3.0-or-later.
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/features/auto-updater/index.html b/public/features/auto-updater/index.html
index 3ac87c9..aa07dec 100644
--- a/public/features/auto-updater/index.html
+++ b/public/features/auto-updater/index.html
@@ -81,7 +81,9 @@ Abfrage gegen https://git.kgva.ch/karim/RAPPORT/releases/latest.json Versionsver
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/features/index.html b/public/features/index.html
index 317ae9d..5066232 100644
--- a/public/features/index.html
+++ b/public/features/index.html
@@ -51,7 +51,9 @@ Module ZeiterfassungTages- &amp; Wochenraster mit Drag &amp; Drop. Rechnungen &a
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/features/mitarbeiter/index.html b/public/features/mitarbeiter/index.html
index 8804263..6a1c5a0 100644
--- a/public/features/mitarbeiter/index.html
+++ b/public/features/mitarbeiter/index.html
@@ -77,7 +77,9 @@ Name, Eintrittsdatum, Pensum (%) Stundensatz (intern, für Rechnungen) Ferienans
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/features/projekte/index.html b/public/features/projekte/index.html
index d169c7c..415bfbf 100644
--- a/public/features/projekte/index.html
+++ b/public/features/projekte/index.html
@@ -71,7 +71,9 @@ Stammdaten — Nummer, Bezeichnung, Standort, Bauschätzwert Kunde — verknüpf
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/features/protokolle/index.html b/public/features/protokolle/index.html
index 42a496b..6f59bfe 100644
--- a/public/features/protokolle/index.html
+++ b/public/features/protokolle/index.html
@@ -94,7 +94,9 @@ Empfänger, Datum, Bezug Positionen (Plan-Nummer, Bezeichnung, Anzahl, Massstab)
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/features/rechnungen/index.html b/public/features/rechnungen/index.html
index e6911c0..d10ee59 100644
--- a/public/features/rechnungen/index.html
+++ b/public/features/rechnungen/index.html
@@ -107,7 +107,9 @@ Bürodaten — IBAN, Empfänger-Adresse Kundendaten — Schuldner-Adresse Rechnu
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/features/spesen/index.html b/public/features/spesen/index.html
index 87eb2fe..f0976aa 100644
--- a/public/features/spesen/index.html
+++ b/public/features/spesen/index.html
@@ -93,7 +93,9 @@ Einnahmen — Rechnungsbeträge, sortiert nach Eingang Ausgaben — Spesen, Bür
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/features/system-tray/index.html b/public/features/system-tray/index.html
index e0074e4..6abafa9 100644
--- a/public/features/system-tray/index.html
+++ b/public/features/system-tray/index.html
@@ -95,7 +95,9 @@ Verhalten Aktion Verhalten Fenster schliessen (⌘W oder rotes X) App läuft im
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/features/zeiterfassung/index.html b/public/features/zeiterfassung/index.html
index cf5112b..8503fe9 100644
--- a/public/features/zeiterfassung/index.html
+++ b/public/features/zeiterfassung/index.html
@@ -72,7 +72,9 @@ Eingabe Wochenraster mit den 5 (oder 7) Arbeitstagen Halbstunden-Slots von 06:00
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/hosting-preise/index.html b/public/hosting-preise/index.html
index 8590e67..ee4a0f5 100644
--- a/public/hosting-preise/index.html
+++ b/public/hosting-preise/index.html
@@ -49,7 +49,9 @@
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/hosting/index.html b/public/hosting/index.html
index da8e592..957c46d 100644
--- a/public/hosting/index.html
+++ b/public/hosting/index.html
@@ -48,7 +48,9 @@
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/impressum/index.html b/public/impressum/index.html
index d5d5ee2..a576fe2 100644
--- a/public/impressum/index.html
+++ b/public/impressum/index.html
@@ -80,7 +80,9 @@ Haftungsausschluss Die Inhalte dieser Website wurden mit grösstmöglicher Sorgf
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/index.html b/public/index.html
index fd6b951..7ae8134 100644
--- a/public/index.html
+++ b/public/index.html
@@ -49,7 +49,9 @@
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/js/hosting-app.js b/public/js/hosting-app.js
index e78599e..f0cb92a 100644
--- a/public/js/hosting-app.js
+++ b/public/js/hosting-app.js
@@ -64,6 +64,9 @@
 
   // ── Login ──────────────────────────────────────────────────────────────
   function renderLogin() {
+    // Schon eingeloggt? Dann nicht das Login-Formular zeigen, sondern direkt
+    // ins Konto — der häufigste Grund für "ich muss mich ständig neu anmelden".
+    if (tok.isLoggedIn) return go("/konto/");
     root.innerHTML = card(authCard(
       '<div class="hosting-title">Anmelden</div>' +
       '<div class="hosting-sub">Zu Ihrer Rapport-Instanz</div>' +
@@ -95,6 +98,7 @@
 
   // ── Registrierung ──────────────────────────────────────────────────────
   function renderRegister() {
+    if (tok.isLoggedIn) return go("/konto/");
     root.innerHTML = card(authCard(
       '<div class="hosting-title">Konto erstellen</div>' +
       '<div class="hosting-sub">In Minuten zur eigenen Instanz</div>' +
diff --git a/public/js/nav-account.js b/public/js/nav-account.js
new file mode 100644
index 0000000..d2afaa9
--- /dev/null
+++ b/public/js/nav-account.js
@@ -0,0 +1,32 @@
+/* RAPPORT Hosting — Navbar/CTA-Anpassung je nach Login-Status.
+ * Läuft auf ALLEN Seiten (im baseof eingebunden). Wenn ein Kunde eingeloggt
+ * ist (rapport_host_token vorhanden), werden:
+ *   - Hosting-CTAs ("Jetzt starten" / "Kostenlos registrieren") → "Mein Konto"
+ *   - der Navbar-Eintrag "Anmelden" → "Mein Konto"
+ * So landet ein eingeloggter Kunde nicht wieder im Marketing-/Login-Flow.
+ */
+(function () {
+  "use strict";
+  var loggedIn = !!localStorage.getItem("rapport_host_token");
+  if (!loggedIn) return;
+
+  function ready(fn) {
+    if (document.readyState !== "loading") fn();
+    else document.addEventListener("DOMContentLoaded", fn);
+  }
+
+  ready(function () {
+    // 1. Hero-/CTA-Buttons, die auf /register/ zeigen → /konto/ "Mein Konto"
+    document.querySelectorAll('a[href="/register/"]').forEach(function (a) {
+      a.setAttribute("href", "/konto/");
+      a.textContent = "Mein Konto";
+    });
+    // 2. Navbar-Link "Anmelden" (zeigt auf /login/) → "Mein Konto"
+    document.querySelectorAll('a[href="/login/"]').forEach(function (a) {
+      a.setAttribute("href", "/konto/");
+      // Navbar-Label kann in einem <span> liegen
+      var span = a.querySelector("span");
+      if (span) span.textContent = "Mein Konto"; else a.textContent = "Mein Konto";
+    });
+  });
+})();
diff --git a/public/konto/index.html b/public/konto/index.html
index 088eeca..ad5d3bf 100644
--- a/public/konto/index.html
+++ b/public/konto/index.html
@@ -49,7 +49,9 @@
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/lizenz/index.html b/public/lizenz/index.html
index 68ddecb..9c74d26 100644
--- a/public/lizenz/index.html
+++ b/public/lizenz/index.html
@@ -54,7 +54,9 @@ Quellcode: git.kgva.ch/karim/RAPPORT Autor: Karim Gabriele Varano Lizenz Lizenzi
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/login/index.html b/public/login/index.html
index 9f04587..a330654 100644
--- a/public/login/index.html
+++ b/public/login/index.html
@@ -49,7 +49,9 @@
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/register/index.html b/public/register/index.html
index fdafd56..3ad484f 100644
--- a/public/register/index.html
+++ b/public/register/index.html
@@ -49,7 +49,9 @@
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/server/index.html b/public/server/index.html
index 896af63..a7887f1 100644
--- a/public/server/index.html
+++ b/public/server/index.html
@@ -54,7 +54,9 @@ Wann brauchst du Rapport Server? Szenario Lösung Ein Mensch, ein Mac Desktop-Ap
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/public/tags/index.html b/public/tags/index.html
index 34a4964..8ece98c 100644
--- a/public/tags/index.html
+++ b/public/tags/index.html
@@ -47,7 +47,9 @@
 
   
   
-  </head>
+  
+<script defer src="/js/nav-account.js"></script>
+</head>
 <body>
     <a href="#content" class="hx:sr-only hx:focus-visible:not-sr-only hx:focus-visible:fixed hx:focus-visible:z-50 hx:focus-visible:top-2 hx:focus-visible:left-2 hx:focus-visible:bg-primary-500 hx:focus-visible:text-white hx:focus-visible:px-4 hx:focus-visible:py-2 hx:focus-visible:rounded-md hx:focus-visible:text-sm hx:focus-visible:font-medium">Zum Inhalt springen</a><div class="hextra-nav-container hx:sticky hx:top-0 hx:z-20 hx:w-full hx:bg-transparent hx:print:hidden">
   <div
diff --git a/static/js/hosting-app.js b/static/js/hosting-app.js
index e78599e..f0cb92a 100644
--- a/static/js/hosting-app.js
+++ b/static/js/hosting-app.js
@@ -64,6 +64,9 @@
 
   // ── Login ──────────────────────────────────────────────────────────────
   function renderLogin() {
+    // Schon eingeloggt? Dann nicht das Login-Formular zeigen, sondern direkt
+    // ins Konto — der häufigste Grund für "ich muss mich ständig neu anmelden".
+    if (tok.isLoggedIn) return go("/konto/");
     root.innerHTML = card(authCard(
       '<div class="hosting-title">Anmelden</div>' +
       '<div class="hosting-sub">Zu Ihrer Rapport-Instanz</div>' +
@@ -95,6 +98,7 @@
 
   // ── Registrierung ──────────────────────────────────────────────────────
   function renderRegister() {
+    if (tok.isLoggedIn) return go("/konto/");
     root.innerHTML = card(authCard(
       '<div class="hosting-title">Konto erstellen</div>' +
       '<div class="hosting-sub">In Minuten zur eigenen Instanz</div>' +
diff --git a/static/js/nav-account.js b/static/js/nav-account.js
new file mode 100644
index 0000000..d2afaa9
--- /dev/null
+++ b/static/js/nav-account.js
@@ -0,0 +1,32 @@
+/* RAPPORT Hosting — Navbar/CTA-Anpassung je nach Login-Status.
+ * Läuft auf ALLEN Seiten (im baseof eingebunden). Wenn ein Kunde eingeloggt
+ * ist (rapport_host_token vorhanden), werden:
+ *   - Hosting-CTAs ("Jetzt starten" / "Kostenlos registrieren") → "Mein Konto"
+ *   - der Navbar-Eintrag "Anmelden" → "Mein Konto"
+ * So landet ein eingeloggter Kunde nicht wieder im Marketing-/Login-Flow.
+ */
+(function () {
+  "use strict";
+  var loggedIn = !!localStorage.getItem("rapport_host_token");
+  if (!loggedIn) return;
+
+  function ready(fn) {
+    if (document.readyState !== "loading") fn();
+    else document.addEventListener("DOMContentLoaded", fn);
+  }
+
+  ready(function () {
+    // 1. Hero-/CTA-Buttons, die auf /register/ zeigen → /konto/ "Mein Konto"
+    document.querySelectorAll('a[href="/register/"]').forEach(function (a) {
+      a.setAttribute("href", "/konto/");
+      a.textContent = "Mein Konto";
+    });
+    // 2. Navbar-Link "Anmelden" (zeigt auf /login/) → "Mein Konto"
+    document.querySelectorAll('a[href="/login/"]').forEach(function (a) {
+      a.setAttribute("href", "/konto/");
+      // Navbar-Label kann in einem <span> liegen
+      var span = a.querySelector("span");
+      if (span) span.textContent = "Mein Konto"; else a.textContent = "Mein Konto";
+    });
+  });
+})();
