Minor AddressBookFormHelper update