diff --git a/src/components/admin/settings/IntegrasiTab.tsx b/src/components/admin/settings/IntegrasiTab.tsx
index ca81a97..d086317 100644
--- a/src/components/admin/settings/IntegrasiTab.tsx
+++ b/src/components/admin/settings/IntegrasiTab.tsx
@@ -17,7 +17,7 @@ interface IntegrationSettings {
   integration_whatsapp_number: string;
   integration_whatsapp_url: string;
   integration_google_calendar_id: string;
-  integration_google_service_account_json?: string;
+  google_service_account_json?: string;
   integration_email_provider: string;
   integration_email_api_base_url: string;
   integration_privacy_url: string;
@@ -76,7 +76,7 @@ export function IntegrasiTab() {
         integration_whatsapp_number: platformData.integration_whatsapp_number || '',
         integration_whatsapp_url: platformData.integration_whatsapp_url || '',
         integration_google_calendar_id: platformData.integration_google_calendar_id || '',
-        integration_google_service_account_json: platformData.integration_google_service_account_json || '',
+        google_service_account_json: platformData.google_service_account_json || '',
         integration_email_provider: platformData.integration_email_provider || 'mailketing',
         integration_email_api_base_url: platformData.integration_email_api_base_url || '',
         integration_privacy_url: platformData.integration_privacy_url || '/privacy',
@@ -102,7 +102,7 @@ export function IntegrasiTab() {
         integration_whatsapp_number: settings.integration_whatsapp_number,
         integration_whatsapp_url: settings.integration_whatsapp_url,
         integration_google_calendar_id: settings.integration_google_calendar_id,
-        integration_google_service_account_json: settings.integration_google_service_account_json,
+        google_service_account_json: settings.google_service_account_json,
         integration_email_provider: settings.integration_email_provider,
         integration_email_api_base_url: settings.integration_email_api_base_url,
         integration_privacy_url: settings.integration_privacy_url,
@@ -118,10 +118,10 @@ export function IntegrasiTab() {
 
         if (platformError) {
           // If schema cache error, try saving service account JSON separately via raw SQL
-          if (platformError.code === 'PGRST204' && settings.integration_google_service_account_json) {
+          if (platformError.code === 'PGRST204' && settings.google_service_account_json) {
             console.log('Schema cache error, using fallback RPC method');
             const { error: rpcError } = await supabase.rpc('exec_sql', {
-              sql: `UPDATE platform_settings SET google_service_account_json = '${settings.integration_google_service_account_json.replace(/'/g, "''")}'::jsonb WHERE id = '${settings.id}'`
+              sql: `UPDATE platform_settings SET google_service_account_json = '${settings.google_service_account_json.replace(/'/g, "''")}'::jsonb WHERE id = '${settings.id}'`
             });
 
             if (rpcError) {
@@ -352,15 +352,15 @@ export function IntegrasiTab() {
               Google Service Account JSON
             </Label>
             <Textarea
-              value={settings.integration_google_service_account_json || ''}
-              onChange={(e) => setSettings({ ...settings, integration_google_service_account_json: e.target.value })}
+              value={settings.google_service_account_json || ''}
+              onChange={(e) => setSettings({ ...settings, google_service_account_json: e.target.value })}
               placeholder='{"type": "service_account", "project_id": "...", "private_key": "...", "client_email": "..."}'
               className="min-h-[120px] font-mono text-sm border-2"
             />
             <p className="text-sm text-muted-foreground">
               Paste entire service account JSON from Google Cloud Console. Calendar must be shared with the service account email.
             </p>
-            {settings.integration_google_service_account_json && (
+            {settings.google_service_account_json && (
               <Alert>
                 <AlertTriangle className="w-4 h-4" />
                 <AlertDescription>
@@ -373,7 +373,7 @@ export function IntegrasiTab() {
           <Button
             variant="outline"
             onClick={async () => {
-              if (!settings.integration_google_calendar_id || !settings.integration_google_service_account_json) {
+              if (!settings.integration_google_calendar_id || !settings.google_service_account_json) {
                 toast({ title: "Error", description: "Lengkapi Calendar ID dan Service Account JSON", variant: "destructive" });
                 return;
               }