Fix email, phone number switch