Issue #2257201 by njbarrett: Followup - make uid truly optional in email_registration_unique_username