diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 1cd89bf2643c..ab270b8f0c05 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -388,13 +388,12 @@ class LoginController extends BaseController
                 $cu = CompanyUser::query()
                                   ->where('user_id', auth()->user()->id);
 
-                // $cu->first()->account->companies->each(function ($company) use($cu){
 
-                //     if($company->tokens()->where('is_system', true)->count() == 0)
-                //     {
-                //         CreateCompanyToken::dispatchNow($company, $cu->first()->user, request()->server('HTTP_USER_AGENT'));
-                //     }
-                // });
+                    $truth = app()->make(TruthSource::class);
+
+                    $truth->setCompanyUser($cu->first());
+                    $truth->setUser(auth()->user());
+                    $truth->setCompany(auth()->user()->account->default_company);
 
             
                     if($existing_user->company_users()->count() != $existing_user->tokens()->count())
diff --git a/app/Models/User.php b/app/Models/User.php
index bf2195fb372e..d47de44c3401 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -156,6 +156,8 @@ class User extends Authenticatable implements MustVerifyEmail
             return CompanyToken::with(['cu'])->where('token', request()->header('X-API-TOKEN'))->first();
         }
 
+        if($truth->getCompany())
+            return $this->tokens()->where('company_id', $truth->getCompany()->id)->first();
 
         return $this->tokens()->first();
     }