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

Solves #1409 and #1413