Fix don't allow to update the existing email address record in add contact
Merge branch 'MH-613' into dev