diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
index 2e267d4dd..5572fefad 100644
--- a/packages/Webkul/Admin/src/Resources/lang/ar/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
@@ -1542,5 +1542,24 @@ return [
             'generate-invoice-applicable' => 'Applicable if automatic generate invoice is enabled',
             'records-found'       => 'تم العثور على السجلات '
         ]
+    ],
+    
+    'api' => [
+        'system'   => [
+            'api'                       => 'API',
+            'basic-configuration'       => 'التكوين الأساسي',
+            'customer-configuration'    => 'تكوين العميل',
+            'username'                  => 'اسم المستخدم',
+            'password'                  => 'كلمه السر',
+            'login-after-register'      => 'تسجيل الدخول بعد التسجيل',
+            'info-login'                => 'المعلومات: يجب على العميل تسجيل الدخول بعد تسجيل API.',
+        ],
+        'auth'      => [
+            'invalid-auth'              => 'تحذير: غير مصرح لك باستخدام واجهات برمجة التطبيقات.',
+            'required-token'            => 'تحذير: مطلوب معلمة الرمز المميز.',
+            'invalid-store'             => 'تحذير: أنت تطلب متجرًا غير صالح.',
+            'login-required'            => 'تحذير: يلزم تسجيل دخول العميل لإضافة المنتج إلى قائمة المقارنة.',
+            'resource-not-found'        => 'تحذير: مطلوب :resource غير موجود في السجل.',
+        ]
     ]
 ];
diff --git a/packages/Webkul/Admin/src/Resources/lang/de/app.php b/packages/Webkul/Admin/src/Resources/lang/de/app.php
index 5134ca886..2fd0859ca 100755
--- a/packages/Webkul/Admin/src/Resources/lang/de/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/de/app.php
@@ -1520,4 +1520,23 @@ return [
             'records-found'                         => 'Datensätze gefunden '
         ],
     ],
+    
+    'api' => [
+        'system'   => [
+            'api'                       => 'API',
+            'basic-configuration'       => 'Grundlegende Einstellung',
+            'customer-configuration'    => 'Kundenkonfiguration',
+            'username'                  => 'Nutzername',
+            'password'                  => 'Passwort',
+            'login-after-register'      => 'Anmelden nach Registrieren',
+            'info-login'                => 'Info: Der Kunde muss sich nach der Registrierung einloggen API.',
+        ],
+        'auth'      => [
+            'invalid-auth'              => 'Warnung: Sie sind nicht berechtigt, APIs zu verwenden.',
+            'required-token'            => 'Warnung: Token-Parameter ist erforderlich.',
+            'invalid-store'             => 'Warnung: Sie fordern einen ungültigen Store an.',
+            'login-required'            => 'Warnung: Kundenlogin ist erforderlich, um das Produkt zur Vergleichsliste hinzuzufügen.',
+            'resource-not-found'        => 'Warnung: Angeforderte :resource nicht im Datensatz gefunden.',
+        ]
+    ]
 ];
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index 426ffc823..707d94d61 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -1556,5 +1556,24 @@ return [
             'generate-invoice-applicable'           => 'Applicable if automatic generate invoice is enabled',
             'records-found'                         => 'Record(s) found'
         ]
+    ],
+    
+    'api' => [
+        'system'   => [
+            'api'                       => 'API',
+            'basic-configuration'       => 'Basic Configuration',
+            'customer-configuration'    => 'Customer Configuration',
+            'username'                  => 'Username',
+            'password'                  => 'Password',
+            'login-after-register'      => 'Login After Register',
+            'info-login'                => 'Info: Customer must be login after registration API.',
+        ],
+        'auth'      => [
+            'invalid-auth'              => 'Warning: You are not authorized to use APIs.',
+            'required-token'            => 'Warning: token parameter is required.',
+            'invalid-store'             => 'Warning: You are requesting an invalid store.',
+            'login-required'            => 'Warning: Customer login is needed to add the product to compare list.',
+            'resource-not-found'        => 'Warning: Requested :resource not found in the record.',
+        ]
     ]
 ];
diff --git a/packages/Webkul/Admin/src/Resources/lang/es/app.php b/packages/Webkul/Admin/src/Resources/lang/es/app.php
index 47adaaa01..e913213ba 100644
--- a/packages/Webkul/Admin/src/Resources/lang/es/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/es/app.php
@@ -1549,5 +1549,24 @@ return [
             'generate-invoice-applicable' => 'Applicable if automatic generate invoice is enabled',
             'records-found'     => 'registros encontrados'
        ]
+    ],
+    
+    'api' => [
+        'system'   => [
+            'api'                       => 'API',
+            'basic-configuration'       => 'Configuracion basica',
+            'customer-configuration'    => 'Configuración del cliente',
+            'username'                  => 'Nombre de usuario',
+            'password'                  => 'Contraseña',
+            'login-after-register'      => 'Iniciar sesión después de registrarse',
+            'info-login'                => 'Información: El cliente debe iniciar sesión después de registrarse en la API.',
+        ],
+        'auth'      => [
+            'invalid-auth'              => 'Advertencia: no está autorizado a utilizar API.',
+            'required-token'            => 'Advertencia: el parámetro token es obligatorio.',
+            'invalid-store'             => 'Advertencia: está solicitando una tienda no válida.',
+            'login-required'            => 'Advertencia: Es necesario iniciar sesión como cliente para agregar el producto a la lista de comparación.',
+            'resource-not-found'        => 'Advertencia: Solicitado :resource no encontrado en el registro.',
+        ]
     ]
 ];
diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
index c28c33886..d243ff9c6 100644
--- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
@@ -1534,5 +1534,24 @@ return [
             'generate-invoice-applicable' => 'Applicable if automatic generate invoice is enabled',
             'records-found'     => 'Record(s) found'
         ]
+    ],
+    
+    'api' => [
+        'system'   => [
+            'api'                       => 'API',
+            'basic-configuration'       => 'Basic Configuration',
+            'customer-configuration'    => 'Customer Configuration',
+            'username'                  => 'Username',
+            'password'                  => 'Password',
+            'login-after-register'      => 'Login After Register',
+            'info-login'                => 'Info: Customer must be login after registration API.',
+        ],
+        'auth'      => [
+            'invalid-auth'              => 'Warning: You are not authorized to use APIs.',
+            'required-token'            => 'Warning: token parameter is required.',
+            'invalid-store'             => 'Warning: You are requesting an invalid store.',
+            'login-required'            => 'Warning: Customer login is needed to add the product to compare list.',
+            'resource-not-found'        => 'Warning: Requested :resource not found in the record.',
+        ]
     ]
 ];
diff --git a/packages/Webkul/Admin/src/Resources/lang/fr/app.php b/packages/Webkul/Admin/src/Resources/lang/fr/app.php
index 49959b8c3..54f1042d2 100644
--- a/packages/Webkul/Admin/src/Resources/lang/fr/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/fr/app.php
@@ -1564,4 +1564,23 @@ return [
             'records-found'     => 'enregistrements trouvés'
         ],
     ],
+    
+    'api' => [
+        'system'   => [
+            'api'                       => 'API',
+            'basic-configuration'       => 'Configuration de base',
+            'customer-configuration'    => 'Configuration client',
+            'username'                  => 'Nom d\'utilisateur',
+            'password'                  => 'Mot de passe',
+            'login-after-register'      => 'Connectez-vous après l\'enregistrement',
+            'info-login'                => 'Info : le client doit être connecté après l\'inscription à l\'API.',
+        ],
+        'auth'      => [
+            'invalid-auth'              => 'Avertissement : Vous n\'êtes pas autorisé à utiliser les API.',
+            'required-token'            => 'Attention : le paramètre du jeton est obligatoire.',
+            'invalid-store'             => 'Attention : vous demandez une boutique invalide.',
+            'login-required'            => 'Attention : la connexion client est nécessaire pour ajouter le produit à la liste de comparaison.',
+            'resource-not-found'        => 'Avertissement : requise :resource introuvable dans l\'enregistrement.',
+        ]
+    ]
 ];
diff --git a/packages/Webkul/Admin/src/Resources/lang/it/app.php b/packages/Webkul/Admin/src/Resources/lang/it/app.php
index ec2c74a92..718ab4726 100644
--- a/packages/Webkul/Admin/src/Resources/lang/it/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/it/app.php
@@ -1539,5 +1539,24 @@ return [
             'generate-invoice-applicable' => 'Applicable if automatic generate invoice is enabled',
             'records-found'     => 'Record(s) found'
         ]
+    ],
+    
+    'api' => [
+        'system'   => [
+            'api'                       => 'API',
+            'basic-configuration'       => 'Configurazione di base',
+            'customer-configuration'    => 'Configurazione del cliente',
+            'username'                  => 'Nome utente',
+            'password'                  => 'Parola d\'ordine',
+            'login-after-register'      => 'Accedi dopo la registrazione',
+            'info-login'                => 'Info: il cliente deve effettuare il login dopo la registrazione API.',
+        ],
+        'auth'      => [
+            'invalid-auth'              => 'Avvertenza: non sei autorizzato a utilizzare le API.',
+            'required-token'            => 'Attenzione: il parametro token è obbligatorio.',
+            'invalid-store'             => 'Attenzione: stai richiedendo un negozio non valido.',
+            'login-required'            => 'Attenzione: è necessario il login del cliente per aggiungere il prodotto alla lista di confronto.',
+            'resource-not-found'        => 'Avvertimento: Richiesto :resource non trovata nel record.',
+        ]
     ]
 ];
diff --git a/packages/Webkul/Admin/src/Resources/lang/nl/app.php b/packages/Webkul/Admin/src/Resources/lang/nl/app.php
index 25b676db2..82085b846 100644
--- a/packages/Webkul/Admin/src/Resources/lang/nl/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/nl/app.php
@@ -1532,5 +1532,24 @@ return [
             'generate-invoice-applicable' => 'Applicable if automatic generate invoice is enabled',
             'records-found'     => 'Record(s) found'
         ]
+    ],
+    
+    'api' => [
+        'system'   => [
+            'api'                       => 'API',
+            'basic-configuration'       => 'Basisconfiguratie',
+            'customer-configuration'    => 'Klantconfiguratie',
+            'username'                  => 'gebruikersnaam',
+            'password'                  => 'Wachtwoord',
+            'login-after-register'      => 'Inloggen na registratie',
+            'info-login'                => 'Info: Klant moet inloggen na registratie API.',
+        ],
+        'auth'      => [
+            'invalid-auth'              => 'Waarschuwing: u bent niet geautoriseerd om API\'s te gebruiken.',
+            'required-token'            => 'Waarschuwing: tokenparameter is vereist.',
+            'invalid-store'             => 'Waarschuwing: u vraagt ​​een ongeldige winkel aan.',
+            'login-required'            => 'Waarschuwing: Klantenlogin is nodig om het product aan de vergelijkingslijst toe te voegen.',
+            'resource-not-found'        => 'Waarschuwing: Gevraagd :resource niet gevonden in het record.',
+        ]
     ]
 ];
diff --git a/packages/Webkul/Admin/src/Resources/lang/pl/app.php b/packages/Webkul/Admin/src/Resources/lang/pl/app.php
index 76e79424f..6f1aaa04f 100644
--- a/packages/Webkul/Admin/src/Resources/lang/pl/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/pl/app.php
@@ -1523,5 +1523,24 @@ return [
             'generate-invoice-applicable' => 'Applicable if automatic generate invoice is enabled',
             'records-found'     => 'Record(s) found'
        ]
+    ],
+    
+    'api' => [
+        'system'   => [
+            'api'                       => 'API',
+            'basic-configuration'       => 'Konfiguracja podstawowa',
+            'customer-configuration'    => 'Konfiguracja klienta',
+            'username'                  => 'Nazwa użytkownika',
+            'password'                  => 'Hasło',
+            'login-after-register'      => 'Zaloguj się po rejestracji',
+            'info-login'                => 'Info: Klient musi być zalogowany po rejestracji API.',
+        ],
+        'auth'      => [
+            'invalid-auth'              => 'Ostrzeżenie: nie masz uprawnień do korzystania z interfejsów API.',
+            'required-token'            => 'Ostrzeżenie: wymagany jest parametr tokena.',
+            'invalid-store'             => 'Ostrzeżenie: prosisz o nieprawidłowy sklep.',
+            'login-required'            => 'Ostrzeżenie: Do dodania produktu do listy porównawczej potrzebny jest login klienta.',
+            'resource-not-found'        => 'Ostrzeżenie: Żądany :resource nie znaleziono w rekordzie.',
+        ]
     ]
 ];
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
index 4a1a8d79f..cc1c56cfe 100755
--- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
@@ -1537,5 +1537,24 @@ return [
             'generate-invoice-applicable' => 'Applicable if automatic generate invoice is enabled',
             'records-found'     => 'Record(s) found'
         ]
+    ],
+    
+    'api' => [
+        'system'   => [
+            'api'                       => 'API',
+            'basic-configuration'       => 'Configuração básica',
+            'customer-configuration'    => 'Configuração do cliente',
+            'username'                  => 'Nome do usuário',
+            'password'                  => 'Senha',
+            'login-after-register'      => 'Login depois de registrar',
+            'info-login'                => 'Informações: O cliente deve fazer o login após o registro API.',
+        ],
+        'auth'      => [
+            'invalid-auth'              => 'Aviso: você não está autorizado a usar APIs.',
+            'required-token'            => 'Aviso: o parâmetro token é obrigatório.',
+            'invalid-store'             => 'Aviso: você está solicitando uma loja inválida.',
+            'login-required'            => 'Aviso: o login do cliente é necessário para adicionar o produto à lista de comparação.',
+            'resource-not-found'        => 'Aviso: Solicitado :resource não encontrado no registro.',
+        ]
     ]
 ];
diff --git a/packages/Webkul/Admin/src/Resources/lang/tr/app.php b/packages/Webkul/Admin/src/Resources/lang/tr/app.php
index 55f7e7a9c..c54751f36 100644
--- a/packages/Webkul/Admin/src/Resources/lang/tr/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/tr/app.php
@@ -1520,5 +1520,24 @@ return [
             'generate-invoice-applicable' => 'Applicable if automatic generate invoice is enabled',
             'records-found'     => 'Record(s) found'
         ]
+    ],
+    
+    'api' => [
+        'system'   => [
+            'api'                       => 'API',
+            'basic-configuration'       => 'Temel yapılandırma',
+            'customer-configuration'    => 'Müşteri Yapılandırması',
+            'username'                  => 'Kullanıcı adı',
+            'password'                  => 'Parola',
+            'login-after-register'      => 'Kayıttan Sonra Giriş Yap',
+            'info-login'                => 'Bilgi: Müşteri, kayıt API\'sinden sonra giriş yapmalıdır.',
+        ],
+        'auth'      => [
+            'invalid-auth'              => 'Uyarı: API\'leri kullanma yetkiniz yok.',
+            'required-token'            => 'Uyarı: belirteç parametresi gerekli.',
+            'invalid-store'             => 'Uyarı: Geçersiz bir mağaza talep ediyorsunuz.',
+            'login-required'            => 'Uyarı: Ürünü karşılaştırma listesine eklemek için müşteri girişi gereklidir.',
+            'resource-not-found'        => 'Uyarı: İstenen :resource Kayıtta bulunamadı.',
+        ]
     ]
 ];
diff --git a/packages/Webkul/Checkout/src/Http/Requests/CustomerAddressForm.php b/packages/Webkul/Checkout/src/Http/Requests/CustomerAddressForm.php
index 5ae0a3981..6c3d68944 100755
--- a/packages/Webkul/Checkout/src/Http/Requests/CustomerAddressForm.php
+++ b/packages/Webkul/Checkout/src/Http/Requests/CustomerAddressForm.php
@@ -100,7 +100,9 @@ class CustomerAddressForm extends FormRequest
      */
     private function getCustomerAddressIds(): string
     {
-        if ($customer = auth('customer')->user()) {
+        $guard = request()->has('token') ? 'api' : 'customer';
+        
+        if ($customer = auth($guard)->user()) {
             return $customer->addresses->pluck('id')->join(',');
         }