diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 61f52cafa0dc..64da8789bde1 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -390,13 +390,19 @@ class LoginController extends BaseController
         $truth->setUser($user);
         $truth->setCompany($set_company);
 
-        $user->account->companies->each(function ($company) use ($user) {
-            if ($company->tokens()->where('is_system', true)->count() == 0) {
-                (new CreateCompanyToken($company, $user, request()->server('HTTP_USER_AGENT')))->handle();
+        $cu->each(function ($cu){
+            if(CompanyToken::where('company_id', $cu->company_id)->where('user_id', $cu->user_id)->where('is_system', true)->doesntExist()){
+                (new CreateCompanyToken($cu->company, $cu->user, request()->server('HTTP_USER_AGENT')))->handle();
             }
         });
 
-        $truth->setCompanyToken(CompanyToken::where('user_id', $user->id)->where('company_id', $set_company->id)->first());
+        // $user->account->companies->each(function ($company) use ($user) {
+        //     if ($company->tokens()->where('user_id',$user->id)->where('is_system', true)->count() == 0) {
+        //         (new CreateCompanyToken($company, $user, request()->server('HTTP_USER_AGENT')))->handle();
+        //     }
+        // });
+
+        $truth->setCompanyToken(CompanyToken::where('user_id', $user->id)->where('company_id', $set_company->id)->where('is_system', true)->first());
 
         return CompanyUser::query()->where('user_id', $user->id);
     }
diff --git a/app/Models/User.php b/app/Models/User.php
index 35441ff43d89..7d8e2474e45d 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -226,6 +226,7 @@ class User extends Authenticatable implements MustVerifyEmail
             return $truth->getCompanyToken();
         }
 
+        // if (request()->header('X-API-TOKEN')) {
         if (request()->header('X-API-TOKEN')) {
             return CompanyToken::with(['cu'])->where('token', request()->header('X-API-TOKEN'))->first();
         }