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