Fixes for contacts with no primary email address