diff --git a/physics/templates/physics/exam_scores_user.html b/physics/templates/physics/exam_scores_user.html
index 49d08ca1..00d78afb 100644
--- a/physics/templates/physics/exam_scores_user.html
+++ b/physics/templates/physics/exam_scores_user.html
@@ -15,7 +15,7 @@
Question {{forloop.counter}}
{% endif %}
-
+
- {{ question.stem|safe }}
{% for q, a, score, correct_answer in ans %}
@@ -23,11 +23,24 @@
{{q|safe}}: {% if exam.publish_results %}Correct answer: {{correct_answer|safe}}{% endif %}
{{a}}
- {% if exam.publish_results or view_all_results%}
-
- (Score: {{score}})
-
+ {% if exam.publish_results or view_all_results%}
+
+ (Score: {{score}})
+
+ {% endif %}
+ {% if exam.publish_results %}
+ {% if forloop.counter0 == 0 and question.a_feedback %}
+ Feedback: {{ question.a_feedback|safe }}
+ {% elif forloop.counter0 == 1 and question.b_feedback %}
+ Feedback: {{ question.b_feedback|safe }}
+ {% elif forloop.counter0 == 2 and question.c_feedback %}
+ Feedback: {{ question.c_feedback|safe }}
+ {% elif forloop.counter0 == 3 and question.d_feedback %}
+ Feedback: {{ question.d_feedback|safe }}
+ {% elif forloop.counter0 == 4 and question.e_feedback %}
+ Feedback: {{ question.e_feedback|safe }}
{% endif %}
+ {% endif %}
{% endfor %}