diff --git a/backend/open_webui/apps/audio/main.py b/backend/open_webui/apps/audio/main.py
index 2b06e382f..f30ff81cf 100644
--- a/backend/open_webui/apps/audio/main.py
+++ b/backend/open_webui/apps/audio/main.py
@@ -23,7 +23,6 @@ from open_webui.config import (
     AUDIO_TTS_VOICE,
     AUDIO_TTS_AZURE_SPEECH_REGION,
     AUDIO_TTS_AZURE_SPEECH_OUTPUT_FORMAT,
-    OPENAI_FORWARD_USER_INFO_AS_HEADERS,
     CACHE_DIR,
     CORS_ALLOW_ORIGIN,
     WHISPER_MODEL,
@@ -33,7 +32,7 @@ from open_webui.config import (
 )
 
 from open_webui.constants import ERROR_MESSAGES
-from open_webui.env import SRC_LOG_LEVELS, DEVICE_TYPE
+from open_webui.env import SRC_LOG_LEVELS, DEVICE_TYPE, ENABLE_FORWARD_USER_INFO_HEADERS
 from fastapi import Depends, FastAPI, File, HTTPException, Request, UploadFile, status
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import FileResponse
@@ -249,7 +248,7 @@ async def speech(request: Request, user=Depends(get_verified_user)):
         headers["Authorization"] = f"Bearer {app.state.config.TTS_OPENAI_API_KEY}"
         headers["Content-Type"] = "application/json"
 
-        if OPENAI_FORWARD_USER_INFO_AS_HEADERS:
+        if ENABLE_FORWARD_USER_INFO_HEADERS:
             headers["X-OpenWebUI-User-Name"] = user.name
             headers["X-OpenWebUI-User-Id"] = user.id
             headers["X-OpenWebUI-User-Email"] = user.email
diff --git a/backend/open_webui/apps/images/main.py b/backend/open_webui/apps/images/main.py
index bb85b809e..53069af1d 100644
--- a/backend/open_webui/apps/images/main.py
+++ b/backend/open_webui/apps/images/main.py
@@ -25,7 +25,6 @@ from open_webui.config import (
     COMFYUI_WORKFLOW,
     COMFYUI_WORKFLOW_NODES,
     CORS_ALLOW_ORIGIN,
-    OPENAI_FORWARD_USER_INFO_AS_HEADERS,
     ENABLE_IMAGE_GENERATION,
     IMAGE_GENERATION_ENGINE,
     IMAGE_GENERATION_MODEL,
@@ -36,7 +35,7 @@ from open_webui.config import (
     AppConfig,
 )
 from open_webui.constants import ERROR_MESSAGES
-from open_webui.env import SRC_LOG_LEVELS
+from open_webui.env import SRC_LOG_LEVELS, ENABLE_FORWARD_USER_INFO_HEADERS
 from fastapi import Depends, FastAPI, HTTPException, Request
 from fastapi.middleware.cors import CORSMiddleware
 from pydantic import BaseModel
@@ -457,7 +456,7 @@ async def image_generations(
             headers["Authorization"] = f"Bearer {app.state.config.OPENAI_API_KEY}"
             headers["Content-Type"] = "application/json"
 
-            if OPENAI_FORWARD_USER_INFO_AS_HEADERS:
+            if ENABLE_FORWARD_USER_INFO_HEADERS:
                 headers["X-OpenWebUI-User-Name"] = user.name
                 headers["X-OpenWebUI-User-Id"] = user.id
                 headers["X-OpenWebUI-User-Email"] = user.email
diff --git a/backend/open_webui/apps/openai/main.py b/backend/open_webui/apps/openai/main.py
index 756f5d937..c19d32a8b 100644
--- a/backend/open_webui/apps/openai/main.py
+++ b/backend/open_webui/apps/openai/main.py
@@ -16,12 +16,12 @@ from open_webui.config import (
     MODEL_FILTER_LIST,
     OPENAI_API_BASE_URLS,
     OPENAI_API_KEYS,
-    OPENAI_FORWARD_USER_INFO_AS_HEADERS,
     AppConfig,
 )
 from open_webui.env import (
     AIOHTTP_CLIENT_TIMEOUT,
     AIOHTTP_CLIENT_TIMEOUT_OPENAI_MODEL_LIST,
+    ENABLE_FORWARD_USER_INFO_HEADERS,
 )
 
 from open_webui.constants import ERROR_MESSAGES
@@ -141,7 +141,7 @@ async def speech(request: Request, user=Depends(get_verified_user)):
         if "openrouter.ai" in app.state.config.OPENAI_API_BASE_URLS[idx]:
             headers["HTTP-Referer"] = "https://openwebui.com/"
             headers["X-Title"] = "Open WebUI"
-        if OPENAI_FORWARD_USER_INFO_AS_HEADERS:
+        if ENABLE_FORWARD_USER_INFO_HEADERS:
             headers["X-OpenWebUI-User-Name"] = user.name
             headers["X-OpenWebUI-User-Id"] = user.id
             headers["X-OpenWebUI-User-Email"] = user.email
@@ -331,7 +331,7 @@ async def get_models(url_idx: Optional[int] = None, user=Depends(get_verified_us
         headers = {}
         headers["Authorization"] = f"Bearer {key}"
         headers["Content-Type"] = "application/json"
-        if OPENAI_FORWARD_USER_INFO_AS_HEADERS:
+        if ENABLE_FORWARD_USER_INFO_HEADERS:
             headers["X-OpenWebUI-User-Name"] = user.name
             headers["X-OpenWebUI-User-Id"] = user.id
             headers["X-OpenWebUI-User-Email"] = user.email
@@ -448,7 +448,7 @@ async def generate_chat_completion(
     if "openrouter.ai" in app.state.config.OPENAI_API_BASE_URLS[idx]:
         headers["HTTP-Referer"] = "https://openwebui.com/"
         headers["X-Title"] = "Open WebUI"
-    if OPENAI_FORWARD_USER_INFO_AS_HEADERS:
+    if ENABLE_FORWARD_USER_INFO_HEADERS:
         headers["X-OpenWebUI-User-Name"] = user.name
         headers["X-OpenWebUI-User-Id"] = user.id
         headers["X-OpenWebUI-User-Email"] = user.email
@@ -521,7 +521,7 @@ async def proxy(path: str, request: Request, user=Depends(get_verified_user)):
     headers = {}
     headers["Authorization"] = f"Bearer {key}"
     headers["Content-Type"] = "application/json"
-    if OPENAI_FORWARD_USER_INFO_AS_HEADERS:
+    if ENABLE_FORWARD_USER_INFO_HEADERS:
         headers["X-OpenWebUI-User-Name"] = user.name
         headers["X-OpenWebUI-User-Id"] = user.id
         headers["X-OpenWebUI-User-Email"] = user.email
diff --git a/backend/open_webui/config.py b/backend/open_webui/config.py
index 30d8b5463..d8579ba28 100644
--- a/backend/open_webui/config.py
+++ b/backend/open_webui/config.py
@@ -658,12 +658,6 @@ except Exception:
 
 OPENAI_API_BASE_URL = "https://api.openai.com/v1"
 
-OPENAI_FORWARD_USER_INFO_AS_HEADERS = PersistentConfig(
-    "OPENAI_FORWARD_USER_INFO_AS_HEADERS",
-    "oauth.OPENAI_FORWARD_USER_INFO_AS_HEADERS",
-    os.environ.get("OPENAI_FORWARD_USER_INFO_AS_HEADERS", "False").lower() == "true",
-)
-
 ####################################
 # WEBUI
 ####################################
diff --git a/backend/open_webui/env.py b/backend/open_webui/env.py
index 4b61e1a89..8aa16aceb 100644
--- a/backend/open_webui/env.py
+++ b/backend/open_webui/env.py
@@ -195,6 +195,15 @@ CHANGELOG = changelog_json
 
 SAFE_MODE = os.environ.get("SAFE_MODE", "false").lower() == "true"
 
+####################################
+# FORWARD_USER_INFO_AS_HEADERS
+####################################
+
+ENABLE_FORWARD_USER_INFO_HEADERS = os.environ.get(
+    "ENABLE_FORWARD_USER_INFO_HEADERS", "False"
+).lower() == "true"
+
+
 ####################################
 # WEBUI_BUILD_HASH
 ####################################