diff --git a/app/config/app.php b/app/config/app.php
index 231531cb..8f8dd215 100644
--- a/app/config/app.php
+++ b/app/config/app.php
@@ -173,17 +173,17 @@ return [
 
     'aliases' => [
 
-        'App'       => 'Illuminate\Support\Facades\App',
-        'Auth'      => 'Illuminate\Support\Facades\Auth',
-        'Form'      => 'Illuminate\Support\Facades\Form',
-        'Input'     => 'Illuminate\Support\Facades\Input',
-        'Redirect'  => 'Illuminate\Support\Facades\Redirect',
-        'Request'   => 'Illuminate\Support\Facades\Request',
-        'Response'  => 'Illuminate\Support\Facades\Response',
-        'Route'     => 'Illuminate\Support\Facades\Route',
-        'Session'   => 'Illuminate\Support\Facades\Session',
-        'Setting'   => 'CachetHQ\Cachet\Models\Setting',
-        'Str'       => 'Illuminate\Support\Str',
+        'App'      => 'Illuminate\Support\Facades\App',
+        'Auth'     => 'Illuminate\Support\Facades\Auth',
+        'Form'     => 'Illuminate\Support\Facades\Form',
+        'Input'    => 'Illuminate\Support\Facades\Input',
+        'Redirect' => 'Illuminate\Support\Facades\Redirect',
+        'Request'  => 'Illuminate\Support\Facades\Request',
+        'Response' => 'Illuminate\Support\Facades\Response',
+        'Route'    => 'Illuminate\Support\Facades\Route',
+        'Session'  => 'Illuminate\Support\Facades\Session',
+        'Setting'  => 'CachetHQ\Cachet\Models\Setting',
+        'Str'      => 'Illuminate\Support\Str',
 
     ],
 
diff --git a/app/views/dashboard/team/index.blade.php b/app/views/dashboard/team/index.blade.php
index 860886a4..ba62e098 100644
--- a/app/views/dashboard/team/index.blade.php
+++ b/app/views/dashboard/team/index.blade.php
@@ -21,7 +21,7 @@
                 <div class="user-grid">
                     @foreach($teamMembers as $member)
                     <div class="user col-sm-3 col-xs-6">
-                        <a href="@if(Auth::user()->id == $member->id) {{ url('dashboard/user') }} @else /dashboard/team/{{ $member->id }}  @endif">
+                        <a href="@if(Auth::user()->id == $member->id) {{ url('dashboard/user') }} @else /dashboard/team/{{ $member->id }} @endif">
                             <img src="{{ $member->gravatar }}" />
                         </a>
                         <div class="name">{{ $member->username }}</div>
diff --git a/app/views/dashboard/user/index.blade.php b/app/views/dashboard/user/index.blade.php
index 5ac00dda..c9c7026f 100644
--- a/app/views/dashboard/user/index.blade.php
+++ b/app/views/dashboard/user/index.blade.php
@@ -46,11 +46,11 @@
                         <div class="form-group">
                             <label class="checkbox-inline">
                                 <input type="hidden" name="google2fa" value="0" />
-                                <input type='checkbox' name="google2fa" value="1" {{ Auth::user()->hasEnabled2FA ? "checked" : "" }} />
+                                <input type='checkbox' name="google2fa" value="1" {{ Auth::user()->hasTwoFactor ? "checked" : "" }} />
                                 {{ trans('forms.setup.enable_google2fa') }}
                             </label>
                         </div>
-                        @if(Auth::user()->hasEnabled2FA)
+                        @if(Auth::user()->hasTwoFactor)
                         <div class="form-group">
                             <?php
                             $google2fa_url = PragmaRX\Google2FA\Vendor\Laravel\Facade::getQRCodeGoogleUrl(
diff --git a/src/Http/Controllers/AuthController.php b/src/Http/Controllers/AuthController.php
index e19f0ddf..779d35f8 100644
--- a/src/Http/Controllers/AuthController.php
+++ b/src/Http/Controllers/AuthController.php
@@ -40,7 +40,7 @@ class AuthController extends Controller
             // Log the user in for one request.
             Auth::once($loginData);
             // Do we have Two Factor Auth enabled?
-            if (Auth::user()->hasEnabled2FA) {
+            if (Auth::user()->hasTwoFactor) {
                 // Temporarily store the user.
                 Session::put('2fa_id', Auth::user()->id);
 
diff --git a/src/Http/Controllers/DashUserController.php b/src/Http/Controllers/DashUserController.php
index 9f16c56d..59c49826 100644
--- a/src/Http/Controllers/DashUserController.php
+++ b/src/Http/Controllers/DashUserController.php
@@ -33,11 +33,19 @@ class DashUserController extends Controller
     {
         $items = Binput::all();
 
+        $passwordChange = array_get($items, 'password');
         $enable2FA = (bool) array_pull($items, 'google2fa');
 
         // Let's enable/disable auth
-        $authSecret = $enable2FA && ! Auth::user()->hasEnabled2FA ? Google2FA::generateSecretKey() : '';
-        $items['google_2fa_secret'] = $authSecret;
+        if ($enable2FA && ! Auth::user()->hasTwoFactor) {
+            $items['google_2fa_secret'] = Google2FA::generateSecretKey();
+        } elseif (! $enable2FA) {
+            $items['google_2fa_secret'] = '';
+        }
+
+        if (trim($passwordChange) === '') {
+            unset($items['password']);
+        }
 
         $updated = Auth::user()->update($items);
 
diff --git a/src/Http/Controllers/SetupController.php b/src/Http/Controllers/SetupController.php
index 806cbf01..e74a87ec 100644
--- a/src/Http/Controllers/SetupController.php
+++ b/src/Http/Controllers/SetupController.php
@@ -127,10 +127,10 @@ class SetupController extends Controller
             $userDetails = array_pull($postData, 'user');
 
             $user = User::create([
-                'username'          => $userDetails['username'],
-                'email'             => $userDetails['email'],
-                'password'          => $userDetails['password'],
-                'level'             => 1,
+                'username' => $userDetails['username'],
+                'email'    => $userDetails['email'],
+                'password' => $userDetails['password'],
+                'level'    => 1,
             ]);
 
             Auth::login($user);
diff --git a/src/Models/User.php b/src/Models/User.php
index 5d695499..0cfbaca0 100644
--- a/src/Models/User.php
+++ b/src/Models/User.php
@@ -139,8 +139,8 @@ class User extends Model implements UserInterface, RemindableInterface
      *
      * @return bool
      */
-    public function getHasEnabled2FAAttribute()
+    public function getHasTwoFactorAttribute()
     {
-        return (bool) (trim($this->google_2fa_secret) !== '');
+        return trim($this->google_2fa_secret) !== '';
     }
 }