Fix for changed FxA login flow