Fix for non-required email/phone validation fields