Merge "Set token properly when creating in User::newSystemUser()"