diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index a462cad626e0..38ceda50614c 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -137,6 +137,9 @@ class BaseController extends Controller
 
 	protected function listResponse($query)
     {
+\DB::connection()->enableQueryLog();
+$queries = \DB::getQueryLog();
+     \Log::error(print_r($queries,1));
 
         $this->buildManager();
 
diff --git a/app/Jobs/Account/CreateAccount.php b/app/Jobs/Account/CreateAccount.php
index c5a439e33bf3..ce3787b76210 100644
--- a/app/Jobs/Account/CreateAccount.php
+++ b/app/Jobs/Account/CreateAccount.php
@@ -77,20 +77,20 @@ class CreateAccount
             auth()->login($user, false); 
 
         $user->setCompany($company);
+
         /*
          * Create token
          */
         $company_token = CreateCompanyToken::dispatchNow($company, $user, $this->request['user_agent']);
-        /*
-         * Login user
-         */
-        //Auth::loginUsingId($user->id, true);
+
         /*
          * Fire related events
          */
         if($user)
             event(new AccountCreated($user));
         
+        $user->fresh();
+
         Notification::route('slack', config('ninja.notification.slack'))
                     ->notify(new NewAccountCreated($user, $company));
 
diff --git a/app/Jobs/User/CreateUser.php b/app/Jobs/User/CreateUser.php
index 803e3cf30a82..36d4541d6f21 100644
--- a/app/Jobs/User/CreateUser.php
+++ b/app/Jobs/User/CreateUser.php
@@ -76,7 +76,6 @@ class CreateUser
 
         event(new UserWasCreated($user, $this->company));
 
-
         return $user;
     }
 }
diff --git a/app/Models/CompanyUser.php b/app/Models/CompanyUser.php
index d1856edc698e..ccf793bcac30 100644
--- a/app/Models/CompanyUser.php
+++ b/app/Models/CompanyUser.php
@@ -57,12 +57,12 @@ class CompanyUser extends Pivot
 
     public function user()
     {
-        return $this->hasOne(User::class, 'id', 'user_id');
+        return $this->belongsTo(User::class);
     }
 
     public function company()
     {
-        return $this->hasOne(Company::class, 'id', 'company_id');
+        return $this->belongsTo(Company::class);
     }
 
     public function users()
diff --git a/app/Models/User.php b/app/Models/User.php
index 52cc199a52a5..ac9fc009849a 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -177,6 +177,9 @@ class User extends Authenticatable implements MustVerifyEmail
 
     public function company_user()
     {
+        if(!$this->id)
+            $this->id = auth()->user()->id;
+
         return $this->hasOneThrough(CompanyUser::class, CompanyToken::class, 'user_id', 'company_id','id','company_id')->where('company_user.user_id', $this->id);
     }