Fix issues with email address