diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/register_coursebook.html b/aleksis/apps/alsijil/templates/alsijil/partials/register_coursebook.html
index f0dff0573337e34b37ad7b6cfeadd9581fb6c9de..ea10cc0e621f09dbcec56e76209c8e4344f3c009 100644
--- a/aleksis/apps/alsijil/templates/alsijil/partials/register_coursebook.html
+++ b/aleksis/apps/alsijil/templates/alsijil/partials/register_coursebook.html
@@ -68,11 +68,20 @@
                   ({{ participation.tardiness }}′)
                 </span>
               {% endif %}
-              {% for extra_mark in note.extra_marks.all %}
-                <span>
-                  {{ note.person.last_name }}, {{ note.person.first_name|slice:"0:1" }}.
-                  ({{ extra_mark.short_name }})
-                </span>
+              {% for personal_note in doc.personal_notes %}
+                {% if personal_note.extra_mark %}
+                  <span>
+                    {{ personal_note.person.short_name }}
+                    ({{ personal_note.extra_mark.short_name }})
+                  </span>
+                {% endif %}
+                {% if personal_note.note %}
+                  <span>
+                    {{ personal_note.person.short_name }}
+                    <!-- MAYBE: Shorten note -->
+                    ({{ personal_note.note }})
+                  </span>
+                {% endif %}
               {% endfor %}
             {% endfor %}
           </td>