diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 243599641780..f68938d166ea 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -19,7 +19,6 @@ use App\Jobs\Account\CreateAccount;
 use App\Libraries\MultiDB;
 use App\Libraries\OAuth\OAuth;
 use App\Libraries\OAuth\Providers\Google;
-use App\Models\CompanyToken;
 use App\Models\CompanyUser;
 use App\Models\User;
 use App\Transformers\CompanyUserTransformer;
@@ -178,15 +177,10 @@ class LoginController extends BaseController
                 ->increment()
                 ->batch();
 
-            $company_token = CompanyToken::with(['user','company'])
-                    ->whereRaw("BINARY `token`= ?", [$request->header('X-API-TOKEN')])
-                    ->first();
-
-            $user = $company_token->user;
+            $user = $this->guard()->user();
             
-            $user->setCompany($company_token->company);
+            $user->setCompany($user->company_user->account->default_company);
 
-//            $ct = CompanyUser::whereUserId($user->id)->with('company');
             $ct = CompanyUser::whereUserId($user->id);
 
             return $this->listResponse($ct);