import httplib as http
import json

from framework import request
from framework.auth import get_current_user
from framework.auth.decorators import must_be_logged_in
from framework.exceptions import HTTPError

from website.project.decorators import must_have_addon


@must_be_logged_in
@must_have_addon('twofactor', 'user')
def user_settings(user, user_addon, *args, **kwargs):
    try:
        data = json.loads(request.data)
    except ValueError:
        raise HTTPError(code=http.BAD_REQUEST)

    code = data.get('code')

    if user_addon.verify_code(code):
        user_addon.is_confirmed = True
        user_addon.save()
        return {}

    raise HTTPError(403)
@@ -339,14 +339,8 @@
 ngs(
-user, 
 user

Fix missing argument (issue arose from merge)