Adding handling of login and retrieval of email address