Fix bug 1104864 - Correctly handle "other" email.

This fixes an actual broken piece of the custom email address signup scheme.
The `email_addresses` list needs to be applied to both locations, since the form is already instantiated at that point in the flow.