diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 698857171b84..772563845e40 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);
             }
 
         }
diff --git a/app/Http/Requests/Account/CreateAccountRequest.php b/app/Http/Requests/Account/CreateAccountRequest.php
index 5d08157acac0..3904bc552397 100644
--- a/app/Http/Requests/Account/CreateAccountRequest.php
+++ b/app/Http/Requests/Account/CreateAccountRequest.php
@@ -40,13 +40,13 @@ class CreateAccountRequest extends Request
             'password'          => 'required|string|min:6',
             'email'             => 'bail|required|email:rfc,dns',
             'email'             => new NewUniqueUserRule(),
-            'privacy_policy'    => 'required',
-            'terms_of_service'  => 'required',
+            'privacy_policy'    => 'required|boolean',
+            'terms_of_service'  => 'required|boolean',
         ];
     }
 
     protected function prepareForValidation()
-    {
+    {nlog($this->all());
         $input = $this->all();
 
         $input['user_agent'] = request()->server('HTTP_USER_AGENT');