diff --git a/backend/src/cms_backend/api/token.py b/backend/src/cms_backend/api/token.py
index 33dc45a7..fbb55384 100644
--- a/backend/src/cms_backend/api/token.py
+++ b/backend/src/cms_backend/api/token.py
@@ -66,8 +66,6 @@ def name(self) -> str:
         return "local"
 
     def can_decode(self, token: str) -> bool:
-        return "local" in Context.auth_modes
-
         if "local" not in Context.auth_modes:
             return False
         try:
@@ -155,9 +153,10 @@ def can_decode(self, token: str) -> bool:
         except Exception:
             return False
 
-        if (
-            payload.get("iss") != Context.oauth_issuer
-            or Context.oauth_session_audience_id not in payload.get("aud", [])
+        if payload.get(
+            "iss"
+        ) != Context.oauth_issuer or Context.oauth_session_audience_id not in payload.get(
+            "aud", []
         ):
             return False
         return True
diff --git a/frontend/src/stores/auth.ts b/frontend/src/stores/auth.ts
index 188afa1c..37e80226 100644
--- a/frontend/src/stores/auth.ts
+++ b/frontend/src/stores/auth.ts
@@ -302,6 +302,7 @@ export const useAuthStore = defineStore('auth', () => {
 
       // Fetch user info from backend using the Kiwix token
       await fetchUserInfo(newToken.access_token)
+      if (!user.value) return false
 
       errors.value = []
       provider.saveToken(newToken)
diff --git a/frontend/src/views/OAuthCallbackView.vue b/frontend/src/views/OAuthCallbackView.vue
index 07ae10dc..3add597b 100644
--- a/frontend/src/views/OAuthCallbackView.vue
+++ b/frontend/src/views/OAuthCallbackView.vue
@@ -26,7 +26,18 @@
               <v-alert type="error" variant="tonal" class="mb-4 text-left">
                 {{ error }}
               </v-alert>
-              <v-btn color="primary" :to="{ name: 'sign-in' }"> Back to Sign In </v-btn>
+              <v-btn v-if="!is2FAError" color="primary" :to="{ name: 'sign-in' }">
+                Back to Sign In
+              </v-btn>
+              <v-btn
+                v-else
+                color="primary"
+                :href="settingsUrl"
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                Configure 2FA
+              </v-btn>
             </div>
           </v-card-text>
         </v-card>
@@ -37,15 +48,29 @@
 
 <script setup lang="ts">
 import { useAuthStore } from '@/stores/auth'
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, computed, inject } from 'vue'
 import { useRouter } from 'vue-router'
+import type { Config } from '@/config'
+import constants from '@/constants'
 
 const router = useRouter()
 const authStore = useAuthStore()
+const config = inject<Config>(constants.config)
+if (!config) {
+  throw new Error('Config is not defined')
+}
 
 const loading = ref(true)
 const error = ref<string | null>(null)
 
+const is2FAError = computed(() => {
+  return error.value?.startsWith('2FA authentication is mandatory on CMS') ?? false
+})
+
+const settingsUrl = computed(() => {
+  return `${config.OAUTH_BASE_URL}/settings`
+})
+
 onMounted(async () => {
   try {
     const success = await authStore.handleCallBack('oauth', window.location.href)