Bug: 12188  Be more consistent with address book selection.

Really need to clean up default addressbook stuff in general, but
this avoids issues with syncing in the meantime.
Signed-off-by: Michael J Rubinsky <mrubinsk@horde.org>