diff --git a/sbas/templates/sbas/exam_scores_user.html b/sbas/templates/sbas/exam_scores_user.html
index c4ba942a..d91ab6b3 100644
--- a/sbas/templates/sbas/exam_scores_user.html
+++ b/sbas/templates/sbas/exam_scores_user.html
@@ -1,21 +1,28 @@
 {% extends 'sbas/base.html' %}
 
 {% block content %}
-<div class="sbas">
-    <h2>Exam: {{ exam.name }}</h2>
-    <h3>Candidate: {{ cid }}</h3>
-    Answers:
-    <ul>
-        {% for question, a, score, correct_answer, chosen_answer in answers_and_marks %}
-        <li class="user-answer-li"><a href="{% url 'sbas:exam_take' exam.pk forloop.counter0 cid passcode %}">Question
-                {{forloop.counter}}</a> - {{ question.stem |safe}}</li>
-        <span>Correct answer: {{correct_answer|safe}} <br />Chosen answer: {{a}} {{chosen_answer|safe}} <span class="answer-{{score}}">(Score:
-                {{score}})</span></span>
-        {% endfor %}
-    </ul>
-    <br /> Total mark: {{ total_score }} / {{max_score}}
-    <div>
-        <a href="{% url 'cid_scores' cid passcode %}">Other exams</a>
+    <div class="sbas">
+        <h2>Exam: {{ exam.name }}</h2>
+        <h3>Candidate: {{ cid }}</h3>
+        {% if not exam.publish_results %}
+            <div class="alert alert-info" role="alert"><h4>Exam results not published</h4>Submitted answers are visible below.</div>
+        {% endif %}
+        Answers:
+        <ul>
+            {% for question, a, score, correct_answer, chosen_answer in answers_and_marks %}
+                <li class="user-answer-li"><a href="{% url 'sbas:exam_take' exam.pk forloop.counter0 cid passcode %}">Question
+                    {{forloop.counter}}</a> - {{ question.stem |safe}}</li>
+                <span>Correct answer: {{correct_answer|safe}} <br />Chosen answer: {{a}} {{chosen_answer|safe}}
+                    {% if exam.publish_results or view_all_results %}
+                    <span class="answer-{{score}}">(Score: {{score}})</span>
+                    {% endif %}
+                
+                </span>
+            {% endfor %}
+        </ul>
+        <br /> Total mark: {{ total_score }} / {{max_score}}
+        <div>
+            <a href="{% url 'cid_scores' cid passcode %}">Other exams</a>
+        </div>
     </div>
-</div>
 {% endblock %}
\ No newline at end of file