diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/person_overview.html b/aleksis/apps/alsijil/templates/alsijil/partials/person_overview.html
index b198a1b2abc69664a88f2ac7fb6deb7bf32c64b3..ed1cd6a6d759bd10b5f42b715760b5c093ecdec1 100644
--- a/aleksis/apps/alsijil/templates/alsijil/partials/person_overview.html
+++ b/aleksis/apps/alsijil/templates/alsijil/partials/person_overview.html
@@ -99,6 +99,7 @@
         {{ participation.documentation.subject.short_name }}
       </td>
       <!-- TODO: Should probably use short_names -->
+      <!--       or just short_name of first (like in coursebook) -->
       <td>{{ participation.note.documentation.teachers.all|join:', ' }}</td>
       <td>{{ participation.absence_reason.short_name }}</td>
       <td>{{ participation.tardiness }}</td>
@@ -126,6 +127,7 @@
         {{ note.documentation.subject.short_name }}
       </td>
       <!-- TODO: Should probably use short_names -->
+      <!--       or just short_name of first (like in coursebook) -->
       <td>{{ note.documentation.teachers.all|join:', ' }}</td>
       <td>{{ note.extra_mark.short_name }}</td>
       <td>{{ note.note }}</td>
diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/register_coursebook.html b/aleksis/apps/alsijil/templates/alsijil/partials/register_coursebook.html
index ea10cc0e621f09dbcec56e76209c8e4344f3c009..591d4efbc387886824cd509219eb5750b2898125 100644
--- a/aleksis/apps/alsijil/templates/alsijil/partials/register_coursebook.html
+++ b/aleksis/apps/alsijil/templates/alsijil/partials/register_coursebook.html
@@ -87,7 +87,7 @@
           </td>
           <td class="lesson-te">
             {% if documentation.topic %}
-              {{ register_object.get_teachers.first.short_name }}
+              {{ doc.teachers.first.short_name }}
             {% endif %}
           </td>
         </tr>
@@ -96,5 +96,3 @@
   {% endfor %}
   </tbody>
 </table>
-
-<div class="page-break">&nbsp;</div>