diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 698857171b..772563845e 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -405,6 +405,20 @@ class LoginController extends BaseController
                     'oauth_user_id' => $google->harvestSubField($user),
                     'oauth_provider_id'=> 'google',
                     ]);
+            
+
+                $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'));
+                    }
+                });
+
+                return $this->timeConstrainedResponse($cu);
             }
 
         }