complete refactor for user email field