Bug 870042 - Impossible to create more than one e-mail account

r? @asutherland: This fixes my boneheaded mistake with a fancy test as penance! It's self-explanatory, I think.