diff --git a/framework/core/src/Core/Command/RegisterUserHandler.php b/framework/core/src/Core/Command/RegisterUserHandler.php
index e477902fa..9d7a120c1 100644
--- a/framework/core/src/Core/Command/RegisterUserHandler.php
+++ b/framework/core/src/Core/Command/RegisterUserHandler.php
@@ -116,7 +116,7 @@ class RegisterUserHandler
         // from the get-go.
         if (isset($token)) {
             foreach ($token->payload as $k => $v) {
-                if ($user->$k === '' || ! isset($user->$k)) {
+                if (in_array($user->$k, ['', null], true)) {
                     $user->$k = $v;
                 }
             }