Fix mixing up of phone and email

Phone and email were not mapped properly between the contact objects
and the db.