Changed the way we get the Email.