diff --git a/admin.html b/admin.html
index 215191b..ab22480 100644
--- a/admin.html
+++ b/admin.html
@@ -241,6 +241,6 @@
         </div>
     </div>
 
-    <script src="/admin.js?v=27" defer></script>
+    <script src="/admin.js?v=28" defer></script>
 </body>
 </html>
diff --git a/admin.js b/admin.js
index 9cb63ba..a12ce6a 100644
--- a/admin.js
+++ b/admin.js
@@ -5,6 +5,7 @@ const SCOPES = 'openid profile email';
 const CONFIG_URL = '/services.json?v=1';
 const LOCAL_CONFIG_KEY = 'mischlabs.dashboard.config';
 const TOKEN_KEY = 'mischlabs.admin.tokens';
+const DASHBOARD_TOKEN_KEY = 'mischlabs.dashboard.tokens';
 const PKCE_KEY = 'mischlabs.admin.pkce';
 
 const loginButton = document.querySelector('#loginButton');
@@ -69,7 +70,7 @@ function decodeJwt(token) {
 
 function getStoredTokens() {
   try {
-    const raw = sessionStorage.getItem(TOKEN_KEY);
+    const raw = sessionStorage.getItem(TOKEN_KEY) || sessionStorage.getItem(DASHBOARD_TOKEN_KEY);
     return raw ? JSON.parse(raw) : null;
   } catch {
     return null;
@@ -78,10 +79,12 @@ function getStoredTokens() {
 
 function storeTokens(tokens) {
   sessionStorage.setItem(TOKEN_KEY, JSON.stringify(tokens));
+  sessionStorage.setItem(DASHBOARD_TOKEN_KEY, JSON.stringify(tokens));
 }
 
 function clearTokens() {
   sessionStorage.removeItem(TOKEN_KEY);
+  sessionStorage.removeItem(DASHBOARD_TOKEN_KEY);
   sessionStorage.removeItem(PKCE_KEY);
 }
 
@@ -1185,6 +1188,9 @@ function closeNavDrawer() {
 async function boot() {
   await handleCallback();
   tokenSet = getStoredTokens();
+  if (isTokenValid(tokenSet)) {
+    storeTokens(tokenSet);
+  }
 
   if (!isTokenValid(tokenSet)) {
     loginPanel.hidden = false;
diff --git a/app.js b/app.js
index 4057002..4027a29 100644
--- a/app.js
+++ b/app.js
@@ -33,6 +33,7 @@ const favoritesSections = document.querySelector('#favoritesSections');
 const loginButton = document.querySelector('#dashboardLoginButton');
 const logoutButton = document.querySelector('#dashboardLogoutButton');
 const favoritesLink = document.querySelector('#favoritesLink');
+const adminPanelLink = document.querySelector('#adminPanelLink');
 const userBadge = document.querySelector('#dashboardUserBadge');
 
 function normalize(value) {
@@ -492,9 +493,14 @@ searchInput.addEventListener('input', updateVisibility);
 
 function updateAuthNav() {
   const authenticated = MischLabsAuth.isAuthenticated();
+  const claims = MischLabsAuth.claims();
+  const username = String(claims?.preferred_username || '').toLowerCase();
+  const email = String(claims?.email || '').toLowerCase();
+  const isAdmin = authenticated && (username === 'mrdiderot' || email === 'mail.misch@pm.me');
   if (loginButton) loginButton.hidden = authenticated;
   if (logoutButton) logoutButton.hidden = !authenticated;
   if (favoritesLink) favoritesLink.hidden = !authenticated;
+  if (adminPanelLink) adminPanelLink.hidden = !isAdmin;
   if (userBadge) {
     userBadge.hidden = !authenticated;
     userBadge.textContent = authenticated ? MischLabsAuth.displayName() : '';
diff --git a/auth.js b/auth.js
index 6e1a349..3e949cc 100644
--- a/auth.js
+++ b/auth.js
@@ -195,6 +195,7 @@ const MischLabsAuth = (() => {
     handleCallback,
     isAuthenticated,
     login,
-    logout
+    logout,
+    tokens
   };
 })();
diff --git a/favorites.html b/favorites.html
index 9e23388..ba61185 100644
--- a/favorites.html
+++ b/favorites.html
@@ -67,7 +67,7 @@
         </section>
     </main>
 
-    <script src="/auth.js?v=1" defer></script>
+    <script src="/auth.js?v=2" defer></script>
     <script src="/favorites.js?v=1" defer></script>
 </body>
 </html>
diff --git a/index.html b/index.html
index aa09eeb..f10c740 100644
--- a/index.html
+++ b/index.html
@@ -45,6 +45,7 @@
 
         <nav class="dashboard-actions" aria-label="Dashboard Aktionen">
             <span class="user-badge" id="dashboardUserBadge" hidden></span>
+            <a class="ghost-button mini" id="adminPanelLink" href="/admin.html" hidden>Admin Panel</a>
             <a class="ghost-button mini" id="favoritesLink" href="/favorites.html" hidden>Favoriten</a>
             <button class="ghost-button mini" id="dashboardLoginButton" type="button">SSO Login</button>
             <button class="ghost-button mini" id="dashboardLogoutButton" type="button" hidden>Abmelden</button>
@@ -133,7 +134,7 @@
         </svg>
     </div>
 
-    <script src="/auth.js?v=1" defer></script>
-    <script src="/app.js?v=34" defer></script>
+    <script src="/auth.js?v=2" defer></script>
+    <script src="/app.js?v=35" defer></script>
 </body>
 </html>
diff --git a/sw.js b/sw.js
index b3eb85e..ef2f977 100644
--- a/sw.js
+++ b/sw.js
@@ -1,12 +1,12 @@
-const CACHE_NAME = 'mischlabs-pwa-v18';
+const CACHE_NAME = 'mischlabs-pwa-v19';
 const APP_SHELL = [
   '/',
   '/index.html',
   '/favorites.html',
   '/offline.html',
   '/style.css?v=29',
-  '/auth.js?v=1',
-  '/app.js?v=34',
+  '/auth.js?v=2',
+  '/app.js?v=35',
   '/favorites.js?v=1',
   '/services.json?v=1',
   '/manifest.webmanifest?v=4',