diff --git a/frontend/src/api/index.js b/frontend/src/api/index.js
index 9d1a289..5da01e0 100644
--- a/frontend/src/api/index.js
+++ b/frontend/src/api/index.js
@@ -28,9 +28,14 @@ api.interceptors.response.use(
       const hadToken = localStorage.getItem('token')
       localStorage.removeItem('token')
       localStorage.removeItem('user')
-      // Only redirect if user was previously logged in (session expired)
+      // Only redirect if user was previously logged in (session expired).
+      // Preserve the destination so login returns the user to this page.
       if (hadToken) {
-        window.location.href = '/login'
+        const here = window.location.pathname + window.location.search
+        const target = here && here !== '/login'
+          ? '/login?redirect=' + encodeURIComponent(here)
+          : '/login'
+        window.location.href = target
       }
     }
     return Promise.reject(error)
diff --git a/frontend/src/views/settings/ApiTokensList.vue b/frontend/src/views/settings/ApiTokensList.vue
index 1557794..d545228 100644
--- a/frontend/src/views/settings/ApiTokensList.vue
+++ b/frontend/src/views/settings/ApiTokensList.vue
@@ -35,7 +35,7 @@
             <tbody>
               <tr v-for="token in myTokens" :key="token.tokenid">
                 <td>{{ token.name }}</td>
-                <td><code>{{ token.displayprefix }}...</code></td>
+                <td><code :title="token.displayprefix + '...'">{{ token.tokenprefix }}...</code></td>
                 <td><span class="badge" :class="scopeBadgeClass(token)">{{ scopeSummary(token) }}</span></td>
                 <td>{{ formatDate(token.createddate) }}</td>
                 <td>{{ token.expiresat ? formatDate(token.expiresat) : 'Never' }}</td>
@@ -84,7 +84,7 @@
             <tr v-for="token in allTokens" :key="token.tokenid">
               <td>{{ token.username || '-' }}</td>
               <td>{{ token.name }}</td>
-              <td><code>{{ token.displayprefix }}...</code></td>
+              <td><code :title="token.displayprefix + '...'">{{ token.tokenprefix }}...</code></td>
               <td><span class="badge" :class="scopeBadgeClass(token)">{{ scopeSummary(token) }}</span></td>
               <td>{{ token.expiresat ? formatDate(token.expiresat) : 'Never' }}</td>
               <td>{{ token.lastusedat ? formatDate(token.lastusedat) : 'Never' }}</td>