Refactor email validation in add contact and should allow duplicate emai...

...l if name does not match