diff --git a/sbas/views.py b/sbas/views.py
index e83fccd0..3e284410 100644
--- a/sbas/views.py
+++ b/sbas/views.py
@@ -253,7 +253,7 @@ def exam_take(request, pk, sk, cid):
     pos = exam.get_question_index(question) + 1
 
     answer = question.cid_user_answers.get(
-        user=request.user)
+        cid=cid)
 
     if request.method == "POST":
         if answer:
@@ -262,7 +262,7 @@ def exam_take(request, pk, sk, cid):
             form = CidUserAnswerForm(request.POST)
         if form.is_valid():
             answer = form.save(commit=False)
-            answer.user = request.user
+            answer.cid = cid
             answer.question = question
             # answer.published_date = timezone.now()
             answer.save()