Add/handle username and email