Flip the FxA popup order (bug 1094384)

Fixes #773