Renaming user_email_address to email_address for simplicity and consistency
WIP?