diff --git a/physics/templates/physics/exam_scores_user.html b/physics/templates/physics/exam_scores_user.html
index 9a0684d6..3d16c1ed 100644
--- a/physics/templates/physics/exam_scores_user.html
+++ b/physics/templates/physics/exam_scores_user.html
@@ -5,7 +5,18 @@
         {% include 'user_score_header.html' %}
         <ul>
             {% for question, ans in answers_and_marks %}
-                <li class="user-answer-li"><span class="question-stem-text">Question {{forloop.counter}} - {{ question.stem|safe }}</span>
+                <li class="user-answer-li"><span class="question-stem-text">
+                    {% if request.user.is_authenticated %}
+                        <a href="{% url 'physics:exam_take_user' pk=exam.id sk=forloop.counter0 %}">
+                            Question {{forloop.counter}}
+                        </a>
+                    {% else %}
+                        <a href="{% url 'physics:exam_take' exam.pk forloop.counter0 cid passcode %}">
+                            Question {{forloop.counter}}
+                        </a>
+                    {% endif %}
+                    
+                    - {{ question.stem|safe }}</span>
                     <ol type="a">
                         {% for q, a, score, correct_answer in ans %}
                             <li class="question-part">
diff --git a/physics/templates/physics/exam_take.html b/physics/templates/physics/exam_take.html
index a724c0ee..c466db2a 100755
--- a/physics/templates/physics/exam_take.html
+++ b/physics/templates/physics/exam_take.html
@@ -95,7 +95,13 @@
     <details><summary>Help</summary>
         <p>Each question contains a list of 5 different statements. These are either True or False</p>
         <p>Click on each statement to toggle between True and False. The current state can be seen to the right of the statement. </p>
-        <p>Your answers are saved when navigating between questions (or if the save button is clicked on the final question). An overview of all the questions can be seen by clicking on the overview button (or by clicking <a target="_blank" href="{% url 'physics:exam_scores_cid_user' pk=exam.pk cid=cid passcode=passcode %}">here</a>).</p>
+        <p>Your answers are saved when navigating between questions (or if the save button is clicked on the final question). An overview of all the questions can be seen by clicking on the overview button (or by clicking <a target="_blank" href="
+    {% if cid %}
+    {% url 'physics:exam_scores_cid_user' pk=exam.pk cid=cid passcode=passcode %}
+    {% else %}
+    {% url 'physics:exam_scores_user' pk=exam.pk %}
+    {% endif %}
+            ">here</a>).</p>
     </details>
 {% endblock %}
 
diff --git a/sbas/templates/sbas/exam_take.html b/sbas/templates/sbas/exam_take.html
index 89236307..36b593cd 100755
--- a/sbas/templates/sbas/exam_take.html
+++ b/sbas/templates/sbas/exam_take.html
@@ -65,7 +65,15 @@
     <details><summary>Help</summary>
         <p>Each question contains a list of 5 different statements. One of these is the single BEST answer.</p>
 <p>Click on the correct statement to select it. Once selected it will be highlighted. </p>
-<p>Your answers are saved when navigating between questions (or if the save button is clicked on the final question). An overview of all the questions can be seen by clicking on the overview button (or by clicking <a target="_blank" href="{% url 'sbas:exam_scores_cid_user' pk=exam.pk cid=cid passcode=passcode %}">here</a>).</p>
+<p>Your answers are saved when navigating between questions (or if the save button is clicked on the final question). An overview of all the questions can be seen by clicking on the overview button (or by clicking <a target="_blank" href="
+    {% if cid %}
+    {% url 'sbas:exam_scores_cid_user' pk=exam.pk cid=cid passcode=passcode %}
+    {% else %}
+    {% url 'sbas:exam_scores_user' pk=exam.pk %}
+    {% endif %}
+    "
+    
+    >here</a>).</p>
     </details>
 {% endblock %}