Refine email and phone mechanics