diff --git a/app/Events/Client/ClientWasCreated.php b/app/Events/Client/ClientWasCreated.php
index aa78706de19c..4e1a50044c34 100644
--- a/app/Events/Client/ClientWasCreated.php
+++ b/app/Events/Client/ClientWasCreated.php
@@ -12,6 +12,7 @@
 namespace App\Events\Client;
 
 use App\Models\Client;
+use App\Models\Company;
 use Illuminate\Queue\SerializesModels;
 
 /**
diff --git a/app/Http/Middleware/TokenAuth.php b/app/Http/Middleware/TokenAuth.php
index bfa3169560bc..28e18655c1dc 100644
--- a/app/Http/Middleware/TokenAuth.php
+++ b/app/Http/Middleware/TokenAuth.php
@@ -67,7 +67,7 @@ class TokenAuth
             //stateless, don't remember the user.
             auth()->login($user, false);
 
-            event(new UserLoggedIn($user));
+            event(new UserLoggedIn($user, $company_token->company));
         } else {
             $error = [
                 'message' => 'Invalid token',