Fix issues with email