Contact validation improved