diff --git a/generic/models.py b/generic/models.py
index 65388f83..3c25b8d4 100644
--- a/generic/models.py
+++ b/generic/models.py
@@ -320,7 +320,11 @@ class CidUser(models.Model):
     def generate_exam_report(self):
         exam_list = self.get_cid_exams()
 
-        exam_text = [f"Candidate {self.cid} [{self.email}]"]
+        name = ""
+        if self.name:
+            name = f"{self.name} "
+
+        exam_text = [f"Candidate {name}{self.cid} [{self.email}]"]
 
         for exam_type, exams in exam_list:
             exam_text.append(f"{'='*len(exam_type)}\n{exam_type}\n{'='*len(exam_type)}")
diff --git a/generic/templates/generic/cid_view.html b/generic/templates/generic/cid_view.html
index 0a9d4d26..2bce2da5 100644
--- a/generic/templates/generic/cid_view.html
+++ b/generic/templates/generic/cid_view.html
@@ -202,7 +202,7 @@ jQuery.fn.dataTable.render.ellipsis = function ( cutoff, wordbreak, escapeHtml )
 
             $("table").DataTable({
     columnDefs: [ {
-      targets: [7,8,9,10,11],
+      targets: [6,7,8,9,10],
       render: $.fn.dataTable.render.ellipsis( 17, true )
     } ]
   });
diff --git a/templates/exam_cids.html b/templates/exam_cids.html
index 53cfa49c..ae82fd14 100644
--- a/templates/exam_cids.html
+++ b/templates/exam_cids.html
@@ -13,8 +13,8 @@
         {% for cid in cid_users %}
         
             <li><a href="{% url 'generic:update_cid' cid.pk %}">{{cid.cid}}</a> [{{cid.passcode}}] {{cid.name}} / 
-                Email: {{cid.email}} / 
-                Supervisor email: {{cid.supervisor_email}} <br />
+                Email: {{cid.email}} 
+                {% if cid.supervisor_email %} / Supervisor email: {{cid.supervisor_email}}{% endif %} <br />
                 Internal candidate: {{cid.internal_candidate}} 
                 {% if cid.login_email_sent %} / Login email sent{% endif %}
                 {% if cid.results_email_sent %} / Results email sent{% endif %}