Fix recaptcha on AMO (bugs 589359, 932514)

This fix manages to not change the entire login implementation to fix what otherwise happens to be an unending series of terrifically simple bugs.

- Bug 932514: Can't switch back to image from audio
- Bug 589359: Seriously why is this still a thing

cc @cvan, @ngokevin