FxA web flow (bug 1033694)

yeah, bad reuse of code here, will fix