Fix bug 1104864 - Correctly handle "other" email.

This fixes an actual broken piece of the custom email address signup scheme.
This is a pretty big horrible bug here, using `*` instead of `**`. So much for magic!