Fixed issue with already set contact not being selected when editing.  Fixes #7