diff --git a/cmd/webserver.go b/cmd/webserver.go
index b3e10527..83cde5d4 100644
--- a/cmd/webserver.go
+++ b/cmd/webserver.go
@@ -337,8 +337,10 @@ func startWebServer(c *core.CliContext) error {
 			}
 
 			// External Authentications
-			apiV1Route.GET("/users/external_auth/list.json", bindApi(api.UserExternalAuths.ExternalAuthListHanlder))
-			apiV1Route.POST("/users/external_auth/unlink.json", bindApi(api.UserExternalAuths.UnlinkExternalAuthHandler))
+			if config.EnableOAuth2Login {
+				apiV1Route.GET("/users/external_auth/list.json", bindApi(api.UserExternalAuths.ExternalAuthListHanlder))
+				apiV1Route.POST("/users/external_auth/unlink.json", bindApi(api.UserExternalAuths.UnlinkExternalAuthHandler))
+			}
 
 			// Application Cloud Settings
 			apiV1Route.GET("/users/settings/cloud/get.json", bindApi(api.UserApplicationCloudSettings.ApplicationSettingsGetHandler))
diff --git a/src/views/desktop/user/settings/tabs/UserSecuritySettingTab.vue b/src/views/desktop/user/settings/tabs/UserSecuritySettingTab.vue
index 116918bf..b2fc99c9 100644
--- a/src/views/desktop/user/settings/tabs/UserSecuritySettingTab.vue
+++ b/src/views/desktop/user/settings/tabs/UserSecuritySettingTab.vue
@@ -63,7 +63,7 @@
             </v-card>
         </v-col>
 
-        <v-col cols="12">
+        <v-col cols="12" v-if="isOAuth2Enabled() && (loadingExternalAuth || (thirdPartyLogins && thirdPartyLogins.length))">
             <v-card :class="{ 'disabled': loadingExternalAuth }">
                 <template #title>
                     <div class="d-flex align-center">
@@ -209,7 +209,7 @@ import { type TokenInfoResponse, SessionInfo } from '@/models/token.ts';
 
 import { isEquals } from '@/lib/common.ts';
 import { parseSessionInfo } from '@/lib/session.ts';
-import { getOIDCCustomDisplayNames, isMCPServerEnabled } from '@/lib/server_settings.ts';
+import { isOAuth2Enabled, getOIDCCustomDisplayNames, isMCPServerEnabled } from '@/lib/server_settings.ts';
 
 import {
     mdiRefresh,
@@ -359,8 +359,6 @@ const inputProblemMessage = computed<string | null>(() => {
 });
 
 function init(): void {
-    loadingExternalAuth.value = true;
-    loadingSession.value = true;
     reloadExternalAuth(true);
     reloadSessions(true);
 }
@@ -403,6 +401,10 @@ function updatePassword(): void {
 }
 
 function reloadExternalAuth(silent?: boolean): void {
+    if (!isOAuth2Enabled()) {
+        return;
+    }
+
     loadingExternalAuth.value = true;
 
     userExternalAuthStore.getExternalAuths().then(response => {
@@ -426,6 +428,10 @@ function reloadExternalAuth(silent?: boolean): void {
 }
 
 function unlinkExternalAuth(thirdPartyLogin: DesktopPageLinkedThirdPartyLogin): void {
+    if (!isOAuth2Enabled()) {
+        return;
+    }
+
     unlinkThirdPartyLoginDialog.value?.open(thirdPartyLogin.externalAuthType).then(() => {
         reloadExternalAuth(true);
     });