diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 697dd36283ce..482d9303d51d 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -380,7 +380,7 @@ class UserController extends BaseController
      */
     public function update(UpdateUserRequest $request, User $user)
     {
-        $old_company_user = $user->company_user;
+        $old_company_user = $user->company_users()->where('company_id', auth()->user()->company()->id)->first();
         $old_user = json_encode($user);
         $old_user_email = $user->getOriginal('email');
 
@@ -395,14 +395,9 @@ class UserController extends BaseController
             $user->save();
             UserEmailChanged::dispatch($new_user, json_decode($old_user), auth()->user()->company());
         }
+
+        $user->company_users()->update(["permissions_updated_at" => now()]);
         
-        
-        if(
-            strcasecmp($old_company_user->permissions, $user->company_user->permissions) != 0 ||
-            $old_company_user->is_admin != $user->company_user->is_admin
-          ){
-            $user->company_user()->update(["permissions_updated_at" => now()]);
-        }
 
         event(new UserWasUpdated($user, auth()->user(), auth()->user()->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
diff --git a/app/Models/User.php b/app/Models/User.php
index afeef5cc9f25..bf2195fb372e 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -202,9 +202,7 @@ class User extends Authenticatable implements MustVerifyEmail
             return $company_token->company;
         }
 
-        // return false;
         throw new \Exception('No Company Found');
-        //return Company::find(config('ninja.company_id'));
     }
 
     public function companyIsSet()
diff --git a/tests/Feature/LoginTest.php b/tests/Feature/LoginTest.php
index 7afee2518c74..9aafba414489 100644
--- a/tests/Feature/LoginTest.php
+++ b/tests/Feature/LoginTest.php
@@ -175,7 +175,7 @@ class LoginTest extends TestCase
         $this->assertTrue($user->companies !== null);
         $this->assertTrue($user->company_users !== null);
         $this->assertTrue($user->company_users->first() !== null);
-        $this->assertTrue($user->company_user()->account !== null);
+        $this->assertTrue($user->account !== null);
 
         $this->assertEquals($user->email, 'test@example.com');
         $this->assertTrue(\Hash::check('123456', $user->password));