diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 40122b37a769..9a5d5bb00554 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -392,7 +392,7 @@ class LoginController extends BaseController
         if($cu->count() == 0)
             return $cu;
 
-        if(auth()->user()->company_users()->count() != auth()->user()->tokens()->count())
+        if(auth()->user()->company_users()->count() != auth()->user()->tokens()->distinct('company_id')->count())
         {
           
           auth()->user()->companies->each(function($company){
diff --git a/app/Models/CompanyUser.php b/app/Models/CompanyUser.php
index 4c940588cd55..8e8fe5e7ac8f 100644
--- a/app/Models/CompanyUser.php
+++ b/app/Models/CompanyUser.php
@@ -98,21 +98,6 @@ class CompanyUser extends Pivot
     public function token()
     {
         return $this->hasMany(CompanyToken::class, 'user_id', 'user_id');
-
-        //return $this->hasMany(CompanyToken::class);
-        //return $this->hasOne(CompanyToken::class, 'user_id', 'user_id','company_id', 'company_id');
-
-
-       //return $this->belongsTo(CompanyToken::class, 'user_id', 'user_id');
-
-        // return $this->hasOneThrough(
-        //     CompanyToken::class,
-        //     CompanyUser::class,
-        //     'user_id', // Foreign key on CompanyUser table...
-        //     'company_id', // Foreign key on CompanyToken table...
-        //     'user_id', // Local key on CompanyToken table...
-        //     'company_id' // Local key on CompanyUser table...
-        // );
     }
 
     public function tokens()