Make sure we're handling empty email address data properly when populating the signup form choices. Fixes bug #1051782.