diff --git a/app/Importer/UserImporter.php b/app/Importer/UserImporter.php
index 942f1cf4a2..81e0156f13 100644
--- a/app/Importer/UserImporter.php
+++ b/app/Importer/UserImporter.php
@@ -10,6 +10,7 @@ use App\Notifications\WelcomeNotification;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Password;
+use Illuminate\Support\Facades\Auth;
 
 /**
  * This is ONLY used for the User Import. When we are importing users
@@ -102,8 +103,7 @@ class UserImporter extends ItemImporter
 
             $this->log('Updating User');
 
-            // Todo - check that this works
-            if (!Gate::allows('canEditAuthFields', $user)) {
+            if (Auth::check() && (!Gate::allows('canEditAuthFields', $user))) {
                 unset($user->username);
                 unset($user->email);
                 unset($user->password);