diff --git a/app/Extensions/OAuth/Schemas/OAuthSchema.php b/app/Extensions/OAuth/Schemas/OAuthSchema.php
index 03853f4bf..99e13d86a 100644
--- a/app/Extensions/OAuth/Schemas/OAuthSchema.php
+++ b/app/Extensions/OAuth/Schemas/OAuthSchema.php
@@ -118,9 +118,7 @@ abstract class OAuthSchema implements OAuthSchemaInterface
 
     public function isEnabled(): bool
     {
-        $id = Str::upper($this->getId());
-
-        return env("OAUTH_{$id}_ENABLED", false);
+        return env($this->getConfigKey(), false);
     }
 
     public function shouldCreateMissingUser(OAuthUser $user): bool
diff --git a/app/Filament/Admin/Pages/Settings.php b/app/Filament/Admin/Pages/Settings.php
index a60c7fe8f..c5bfa48f9 100644
--- a/app/Filament/Admin/Pages/Settings.php
+++ b/app/Filament/Admin/Pages/Settings.php
@@ -563,26 +563,25 @@ class Settings extends Page implements HasSchemas
 
         $oauthSchemas = $this->oauthService->getAll();
         foreach ($oauthSchemas as $schema) {
-            $id = Str::upper($schema->getId());
             $key = $schema->getConfigKey();
 
             $formFields[] = Section::make($schema->getName())
                 ->columns(5)
                 ->icon($schema->getIcon() ?? 'tabler-brand-oauth')
-                ->collapsed(fn () => !env($key, false))
+                ->collapsed(fn () => !$schema->isEnabled())
                 ->collapsible()
                 ->schema([
                     Hidden::make($key)
                         ->live()
-                        ->default(env($key)),
+                        ->default($schema->isEnabled()),
                     Actions::make([
-                        Action::make("disable_oauth_$id")
+                        Action::make('disable_oauth_' . $schema->getId())
                             ->visible(fn (Get $get) => $get($key))
                             ->disabled(fn () => !user()?->can('update settings'))
                             ->label(trans('admin/setting.oauth.disable'))
                             ->color('danger')
                             ->action(fn (Set $set) => $set($key, false)),
-                        Action::make("enable_oauth_$id")
+                        Action::make('enable_oauth_'  . $schema->getId())
                             ->visible(fn (Get $get) => !$get($key))
                             ->disabled(fn () => !user()?->can('update settings'))
                             ->label(trans('admin/setting.oauth.enable'))