Added the fix for adding person email, phone no when selecting from registry

Solves #1409 and #1413
Merge pull request #502 from somayjain/upstream

Fix for adding person email, phone no when selecting from registry