Improve default primary contact.