diff --git a/client/pages/login.vue b/client/pages/login.vue
index 242eb93a..01adadcd 100644
--- a/client/pages/login.vue
+++ b/client/pages/login.vue
@@ -40,11 +40,11 @@
 
           <p v-if="error" class="text-error text-center py-2">{{ error }}</p>
 
-          <div v-if="showNewAuthSystemAdminMessage" class="mb-4">
+          <div v-if="showNewAuthSystemMessage" class="mb-4">
             <widgets-alert type="warning">
               <div>
-                <p>Authentication has been improved for security. All users will be required to re-login.</p>
-                <a href="https://github.com/advplyr/audiobookshelf/discussions/4460" target="_blank" class="underline">More info</a>
+                <p>{{ $strings.MessageAuthenticationSecurityMessage }}</p>
+                <a v-if="showNewAuthSystemAdminMessage" href="https://github.com/advplyr/audiobookshelf/discussions/4460" target="_blank" class="underline">{{ $strings.LabelMoreInfo }}</a>
               </div>
             </widgets-alert>
           </div>
@@ -95,6 +95,8 @@ export default {
       login_local: true,
       login_openid: false,
       authFormData: null,
+      // New JWT auth system re-login flags
+      showNewAuthSystemMessage: false,
       showNewAuthSystemAdminMessage: false
     }
   },
@@ -195,6 +197,7 @@ export default {
     },
     async submitForm() {
       this.error = null
+      this.showNewAuthSystemMessage = false
       this.showNewAuthSystemAdminMessage = false
       this.processing = true
 
@@ -231,14 +234,10 @@ export default {
         .then((res) => {
           // Force re-login if user is using an old token with no expiration
           if (res.user.isOldToken) {
-            if (res.user.type === 'admin' || res.user.type === 'root') {
-              this.username = res.user.username
-              // Show message to admin users about new auth system
-              this.showNewAuthSystemAdminMessage = true
-            } else {
-              // Regular users just shown login
-              this.username = res.user.username
-            }
+            this.username = res.user.username
+            this.showNewAuthSystemMessage = true
+            // Admin user sees link to github discussion
+            this.showNewAuthSystemAdminMessage = res.user.type === 'admin' || res.user.type === 'root'
             return false
           }
           this.setUser(res)
diff --git a/client/strings/en-us.json b/client/strings/en-us.json
index a25f02cf..84127708 100644
--- a/client/strings/en-us.json
+++ b/client/strings/en-us.json
@@ -724,6 +724,7 @@
   "MessageAppriseDescription": "To use this feature you will need to have an instance of <a href=\"https://github.com/caronc/apprise-api\" target=\"_blank\">Apprise API</a> running or an api that will handle those same requests. <br />The Apprise API Url should be the full URL path to send the notification, e.g., if your API instance is served at <code>http://192.168.1.1:8337</code> then you would put <code>http://192.168.1.1:8337/notify</code>.",
   "MessageAsinCheck": "Ensure you are using the ASIN from the correct Audible region, not Amazon.",
   "MessageAuthenticationOIDCChangesRestart": "Restart your server after saving to apply OIDC changes.",
+  "MessageAuthenticationSecurityMessage": "Authentication has been improved for security. All users will be required to re-login.",
   "MessageBackupsDescription": "Backups include users, user progress, library item details, server settings, and images stored in <code>/metadata/items</code> & <code>/metadata/authors</code>. Backups <strong>do not</strong> include any files stored in your library folders.",
   "MessageBackupsLocationEditNote": "Note: Updating the backup location will not move or modify existing backups",
   "MessageBackupsLocationNoEditNote": "Note: The backup location is set through an environment variable and cannot be changed here.",