Fixed issue where user is not getting the correct email.