Added ability to return email address for login