diff --git a/generic/templates/generic/exam_cids.html b/generic/templates/generic/exam_cids.html
index 02a11129..4423d0f5 100644
--- a/generic/templates/generic/exam_cids.html
+++ b/generic/templates/generic/exam_cids.html
@@ -1,19 +1,23 @@
-
{{cid_user_count}} candidates.
-
-
+{% if cid_users %}
+ {{cid_user_count}} candidates.
+
+
{% for cid in cid_users %}
-
- - {{cid.cid}} [{{cid.passcode}}] {{cid.name}} /
- Email: {{cid.email}}
- {% if cid.supervisor_email %} / Supervisor email: {{cid.supervisor_email}}{% endif %}
- Internal candidate: {{cid.internal_candidate}}
- {% if cid.login_email_sent %} / Login email sent{% endif %}
- {% if cid.results_email_sent %} / Results email sent{% endif %}
-
-
- {% endfor %}
-
-
- Edit Exam CIDs
\ No newline at end of file
+ - {{cid.cid}} [{{cid.passcode}}] {{cid.name}} /
+ Email: {{cid.email}}
+ {% if cid.supervisor_email %} / Supervisor email: {{cid.supervisor_email}}{% endif %}
+ Internal candidate: {{cid.internal_candidate}}
+ {% if cid.login_email_sent %} / Login email sent{% endif %}
+ {% if cid.results_email_sent %} / Results email sent{% endif %}
+
+
+ {% endfor %}
+
+{% else %}
+ This exam has not candidates. Add some with the below link.
+{% endif %}
+
+
+Edit Exam CIDs