diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index f194f2bf99b0..9a75a872f34b 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -16,10 +16,8 @@ use App\Http\Controllers\Controller;
 use App\Jobs\Account\CreateAccount;
 use App\Libraries\MultiDB;
 use App\Libraries\OAuth\OAuth;
-use App\Models\Account;
 use App\Models\CompanyUser;
 use App\Models\User;
-use App\Transformers\AccountTransformer;
 use App\Transformers\CompanyUserTransformer;
 use App\Transformers\UserTransformer;
 use App\Utils\Traits\UserSessionAttributes;
@@ -45,9 +43,9 @@ class LoginController extends BaseController
     use AuthenticatesUsers;
     use UserSessionAttributes;
 
-    protected $entity_type = Account::class;
+    protected $entity_type = CompanyUser::class;
 
-    protected $entity_transformer = AccountTransformer::class;
+    protected $entity_transformer = CompanyUserTransformer::class;
 
     /**
      * Where to redirect users after login.
@@ -109,10 +107,9 @@ class LoginController extends BaseController
             
             $user->setCompany($user->user_companies->first()->account->default_company);
 
-            //$ct = CompanyUser::whereUserId($user->id);
+            $ct = CompanyUser::whereUserId($user->id);
+            return $this->listResponse($ct);
 
-            return $this->itemResponse($user->user_companies->first()->account);
-            //return $this->itemResponse($this->guard()->user());
         }
         else {
 
diff --git a/app/Transformers/AccountTransformer.php b/app/Transformers/AccountTransformer.php
index 135a66bbc836..c52649d17b4f 100644
--- a/app/Transformers/AccountTransformer.php
+++ b/app/Transformers/AccountTransformer.php
@@ -33,8 +33,8 @@ class AccountTransformer extends EntityTransformer
      */
     protected $defaultIncludes = [
         //'default_company',
-        'user',
-        'company_users'
+        //'user',
+        //'company_users'
     ];
 
     /**
diff --git a/app/Transformers/CompanyUserTransformer.php b/app/Transformers/CompanyUserTransformer.php
index 015ee0ccea04..2ddd6a067f3f 100644
--- a/app/Transformers/CompanyUserTransformer.php
+++ b/app/Transformers/CompanyUserTransformer.php
@@ -11,10 +11,12 @@
 
 namespace App\Transformers;
 
+use App\Models\Account;
 use App\Models\Company;
 use App\Models\CompanyToken;
 use App\Models\CompanyUser;
 use App\Models\User;
+use App\Transformers\AccountTransformer;
 use App\Transformers\CompanyTokenTransformer;
 
 class CompanyUserTransformer extends EntityTransformer
@@ -24,6 +26,7 @@ class CompanyUserTransformer extends EntityTransformer
      * @var array
      */
     protected $defaultIncludes = [
+        'account',
         'company',
         'user',
         'token'
@@ -35,7 +38,8 @@ class CompanyUserTransformer extends EntityTransformer
     protected $availableIncludes = [
         'user',
         'company',
-        'token'
+        'token',
+        'account',
     ];
 
 
@@ -52,6 +56,14 @@ class CompanyUserTransformer extends EntityTransformer
         ];
     }
 
+    public function includeAccount(CompanyUser $company_user)
+    {
+
+        $transformer = new AccountTransformer($this->serializer);
+
+        return $this->includeItem($company_user->account, $transformer, Account::class);
+    }
+
     public function includeCompany(CompanyUser $company_user)
     {