diff --git a/atlas/templates/atlas/collection_case_view.html b/atlas/templates/atlas/collection_case_view.html
index ed3703ec..96cae4a2 100644
--- a/atlas/templates/atlas/collection_case_view.html
+++ b/atlas/templates/atlas/collection_case_view.html
@@ -56,8 +56,15 @@
 
 {% if take %}
 <h1>TAKE</h1>
-{% endif %}
-
+<div>
+    {% if previous %}
+    <a href="{% url 'atlas:collection_case_view' pk=collection.pk case_number=case_number|add:-1 cid=cid passcode=passcode %}">Previous</a>
+    {% endif %}
+    {% if next %}
+    <a href="{% url 'atlas:collection_case_view' pk=collection.pk case_number=case_number|add:1 cid=cid passcode=passcode %}">Next</a>
+    {% endif %}
+</div>
+{% else %}
 <div>
     {% if previous %}
     <a href="{% url 'atlas:collection_case_view' pk=collection.pk case_number=case_number|add:-1 %}">Previous</a>
@@ -68,6 +75,9 @@
 </div>
 <br />
 Return to <a href='{{collection.get_absolute_url}}'>collection</a>
+
+{% endif %}
+
 {% endblock %}
 {% block js %}
 <script type="text/javascript">
diff --git a/atlas/views.py b/atlas/views.py
index 7f2f3e25..840ad7ed 100755
--- a/atlas/views.py
+++ b/atlas/views.py
@@ -1091,5 +1091,7 @@ def collection_case_view(request, pk, case_number, take=False, cid=None, passcod
             "previous": previous,
             "next": next,
             "take": take,
+            "cid": cid,
+            "passcode": passcode,
         },
     )
diff --git a/generic/forms.py b/generic/forms.py
index b96568a0..9ee89d8a 100755
--- a/generic/forms.py
+++ b/generic/forms.py
@@ -166,6 +166,7 @@ class CidUserForm(ModelForm):
             instance.longs_exams.clear()
             for longs_exams in self.cleaned_data["longs_exams"]:
                 instance.longs_exams.add(longs_exams.pk)
+            instance.casecollection_exams.clear()
             for casecollection_exams in self.cleaned_data["casecollection_exams"]:
                 instance.longs_exams.add(casecollection_exams.pk)