diff --git a/app/Http/Controllers/AccountApiController.php b/app/Http/Controllers/AccountApiController.php
index b979651457d1..1b6d1103bd97 100644
--- a/app/Http/Controllers/AccountApiController.php
+++ b/app/Http/Controllers/AccountApiController.php
@@ -46,10 +46,11 @@ class AccountApiController extends BaseAPIController
     private function processLogin(Request $request)
     {
         // Create a new token only if one does not already exist
-        $this->accountRepo->createTokens(Auth::user(), $request->token_name);
+        $user = Auth::user();
+        $this->accountRepo->createTokens($user, $request->token_name);
         
-        $users = $this->accountRepo->findUsers(Auth::user(), 'account.account_tokens');
-        $data = $this->createCollection($users, new UserAccountTransformer($request->token_name));
+        $users = $this->accountRepo->findUsers($user, 'account.account_tokens');
+        $data = $this->createCollection($users, new UserAccountTransformer($user->account, $request->token_name));
 
         $response = [
             'user_accounts' => $data,
diff --git a/app/Ninja/Transformers/UserAccountTransformer.php b/app/Ninja/Transformers/UserAccountTransformer.php
index 2b3724a2f601..7f82ca3183b7 100644
--- a/app/Ninja/Transformers/UserAccountTransformer.php
+++ b/app/Ninja/Transformers/UserAccountTransformer.php
@@ -1,11 +1,12 @@
 <?php namespace App\Ninja\Transformers;
 
 use App\Models\User;
+use App\Models\Account;
 use League\Fractal;
 use League\Fractal\TransformerAbstract;
 use League\Fractal\Resource\Item;
 
-class UserAccountTransformer extends TransformerAbstract
+class UserAccountTransformer extends EntityTransformer
 {
     protected $defaultIncludes = [
         'user'
@@ -13,14 +14,16 @@ class UserAccountTransformer extends TransformerAbstract
 
     protected $tokenName;
     
-    public function __construct($tokenName)
+    public function __construct(Account $account, $tokenName)
     {
+        parent::__construct($account);
+
         $this->tokenName = $tokenName;
     }
 
     public function includeUser(User $user)
     {
-        return $this->item($user, new UserTransformer);
+        return $this->item($user, new UserTransformer($this->account));
     }
 
     public function transform(User $user)