diff --git a/backend/apps/webui/main.py b/backend/apps/webui/main.py
index f74acd916..46b9a4ac5 100644
--- a/backend/apps/webui/main.py
+++ b/backend/apps/webui/main.py
@@ -35,7 +35,7 @@ from config import (
     DEFAULT_PROMPT_SUGGESTIONS,
     DEFAULT_USER_ROLE,
     ENABLE_SIGNUP,
-    ENABLE_USERNAME_PASSWORD_LOGIN,
+    ENABLE_LOGIN_FORM,
     USER_PERMISSIONS,
     WEBHOOK_URL,
     WEBUI_AUTH_TRUSTED_EMAIL_HEADER,
@@ -65,7 +65,7 @@ origins = ["*"]
 app.state.config = AppConfig()
 
 app.state.config.ENABLE_SIGNUP = ENABLE_SIGNUP
-app.state.config.ENABLE_USERNAME_PASSWORD_LOGIN = ENABLE_USERNAME_PASSWORD_LOGIN
+app.state.config.ENABLE_LOGIN_FORM = ENABLE_LOGIN_FORM
 app.state.config.JWT_EXPIRES_IN = JWT_EXPIRES_IN
 app.state.AUTH_TRUSTED_EMAIL_HEADER = WEBUI_AUTH_TRUSTED_EMAIL_HEADER
 app.state.AUTH_TRUSTED_NAME_HEADER = WEBUI_AUTH_TRUSTED_NAME_HEADER
diff --git a/backend/config.py b/backend/config.py
index 166f82042..9715ca403 100644
--- a/backend/config.py
+++ b/backend/config.py
@@ -709,10 +709,10 @@ ENABLE_SIGNUP = PersistentConfig(
     ),
 )
 
-ENABLE_USERNAME_PASSWORD_LOGIN = PersistentConfig(
-    "ENABLE_USERNAME_PASSWORD_LOGIN",
-    "ui.enable_username_password_login",
-    os.environ.get("ENABLE_USERNAME_PASSWORD_LOGIN", "True").lower() == "true",
+ENABLE_LOGIN_FORM = PersistentConfig(
+    "ENABLE_LOGIN_FORM",
+    "ui.ENABLE_LOGIN_FORM",
+    os.environ.get("ENABLE_LOGIN_FORM", "True").lower() == "true",
 )
 
 DEFAULT_LOCALE = PersistentConfig(
diff --git a/backend/main.py b/backend/main.py
index 218221e59..16d7b2b40 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -1995,7 +1995,7 @@ async def get_app_config():
             "auth": WEBUI_AUTH,
             "auth_trusted_header": bool(webui_app.state.AUTH_TRUSTED_EMAIL_HEADER),
             "enable_signup": webui_app.state.config.ENABLE_SIGNUP,
-            "enable_username_password_login": webui_app.state.config.ENABLE_USERNAME_PASSWORD_LOGIN,
+            "enable_login_form": webui_app.state.config.ENABLE_LOGIN_FORM,
             "enable_web_search": rag_app.state.config.ENABLE_RAG_WEB_SEARCH,
             "enable_image_generation": images_app.state.config.ENABLED,
             "enable_community_sharing": webui_app.state.config.ENABLE_COMMUNITY_SHARING,
diff --git a/src/lib/stores/index.ts b/src/lib/stores/index.ts
index 8a68f91fb..1b0257c4b 100644
--- a/src/lib/stores/index.ts
+++ b/src/lib/stores/index.ts
@@ -145,7 +145,7 @@ type Config = {
 		auth: boolean;
 		auth_trusted_header: boolean;
 		enable_signup: boolean;
-		enable_username_password_login: boolean;
+		enable_login_form: boolean;
 		enable_web_search?: boolean;
 		enable_image_generation: boolean;
 		enable_admin_export: boolean;
diff --git a/src/routes/auth/+page.svelte b/src/routes/auth/+page.svelte
index 2da0367e1..b0f13e386 100644
--- a/src/routes/auth/+page.svelte
+++ b/src/routes/auth/+page.svelte
@@ -173,7 +173,7 @@
 							{/if}
 						</div>
 
-						{#if $config?.features.enable_username_password_login}
+						{#if $config?.features.enable_login_form}
 							<div class="flex flex-col mt-4">
 								{#if mode === 'signup'}
 									<div>
@@ -218,7 +218,7 @@
 							</div>
 						{/if}
 
-						{#if $config?.features.enable_username_password_login}
+						{#if $config?.features.enable_login_form}
 							<div class="mt-5">
 								<button
 									class=" bg-gray-900 hover:bg-gray-800 w-full rounded-2xl text-white font-medium text-sm py-3 transition"
@@ -255,7 +255,7 @@
 					{#if Object.keys($config?.oauth?.providers ?? {}).length > 0}
 						<div class="inline-flex items-center justify-center w-full">
 							<hr class="w-64 h-px my-8 bg-gray-200 border-0 dark:bg-gray-700" />
-							{#if $config?.features.enable_username_password_login}
+							{#if $config?.features.enable_login_form}
 								<span
 									class="absolute px-3 font-medium text-gray-900 -translate-x-1/2 bg-white left-1/2 dark:text-white dark:bg-gray-950"
 									>{$i18n.t('or')}</span