diff --git a/mfa/FIDO2.py b/mfa/FIDO2.py
index 65ed2e4..74a4da8 100644
--- a/mfa/FIDO2.py
+++ b/mfa/FIDO2.py
@@ -48,7 +48,6 @@ def complete_reg(request):
             client_data,
             att_obj
         )
-        print att_obj.fmt
         encoded = websafe_encode(auth_data.credential_data)
         uk=User_Keys()
         uk.username = request.user.username
@@ -60,7 +59,6 @@ def complete_reg(request):
         from raven.contrib.django.raven_compat.models import client
         import traceback
         client.captureException()
-        print traceback.format_exc()
         return HttpResponse(simplejson.dumps({'status': 'ERR',"message":"Error on server, please try again later"}))
 def start(request):
     context = csrf(request)
diff --git a/mfa/totp.py b/mfa/totp.py
index e8d0158..24c3616 100644
--- a/mfa/totp.py
+++ b/mfa/totp.py
@@ -16,12 +16,6 @@ def verify_login(request,username,token):
         if  totp.verify(token,valid_window = 30):
             key.last_used=timezone.now()
             key.save()
-            mfa = {"verified": True, "method": "TOTP"}
-            if getattr(settings, "MFA_RECHECK", False):
-                mfa["next_check"] = int((datetime.datetime.now()
-                                         + datetime.timedelta(
-                            seconds=random.randint(settings.MFA_RECHECK_MIN, settings.MFA_RECHECK_MAX))).strftime("%s"))
-            request.session["mfa"] = mfa
             return True
     return False
 
@@ -39,6 +33,12 @@ def auth(request):
     context=csrf(request)
     if request.method=="POST":
         if verify_login(request,request.session["base_username"],token = request.POST["otp"]):
+            mfa = {"verified": True, "method": "TOTP"}
+            if getattr(settings, "MFA_RECHECK", False):
+                mfa["next_check"] = int((datetime.datetime.now()
+                                         + datetime.timedelta(
+                            seconds=random.randint(settings.MFA_RECHECK_MIN, settings.MFA_RECHECK_MAX))).strftime("%s"))
+            request.session["mfa"] = mfa
             return login(request)
         context["invalid"]=True
     return render_to_response("TOTP/Auth.html", context, context_instance = RequestContext(request))
@@ -48,7 +48,6 @@ def auth(request):
 def getToken(request):
     secret_key=pyotp.random_base32()
     totp = pyotp.TOTP(secret_key)
-    print "Answer is", totp.now()
     request.session["new_mfa_answer"]=totp.now()
     return HttpResponse(simplejson.dumps({"qr":pyotp.totp.TOTP(secret_key).provisioning_uri(str(request.user.username), issuer_name = settings.TOKEN_ISSUER_NAME),
                          "secret_key": secret_key}))