Fix bug 1104864 - Correctly handle "other" email.

This fixes an actual broken piece of the custom email address signup scheme.
Merge pull request #2945 from jezdez/bug1104864

Fix bug 1104864 - Correctly handle "other" email.