fix username when email is used with 2step process registation