diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html b/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
index 80ad5de27ce9654bb43dd77d0724fb408c295dad..f21d7686acb763c6f63942dcab91517020b7e0e2 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
@@ -366,7 +366,7 @@
 
         {% if group_roles %}
           <div class="col s12" id="group-roles">
-            {% include "alsijil/group_role/partials/assigned_roles.html" with roles=group_roles group=lesson_period.lesson.groups.first back_url=back_url %}
+            {% include "alsijil/group_role/partials/assigned_roles.html" with roles=group_roles group=register_object.get_groups.first back_url=back_url %}
           </div>
         {% endif %}
 
diff --git a/aleksis/apps/alsijil/views.py b/aleksis/apps/alsijil/views.py
index 2c13c0b271ae9d7ef0305c09ad6ff0cc6f924ca4..b8d9566604c0a12ad512f9cb72646a5348b06829 100644
--- a/aleksis/apps/alsijil/views.py
+++ b/aleksis/apps/alsijil/views.py
@@ -147,7 +147,7 @@ def register_object(
         else None
     )
     back_url = reverse(
-        "lesson_by_week_and_period", args=[wanted_week.year, wanted_week.week, lesson_period.pk]
+        "lesson_period", args=[wanted_week.year, wanted_week.week, register_object.pk]
     )
     context["back_url"] = back_url
 
@@ -167,9 +167,9 @@ def register_object(
         # Group roles
         show_group_roles = request.user.person.preferences[
             "alsijil__group_roles_in_lesson_view"
-        ] and request.user.has_perm("alsijil.view_assigned_grouproles", lesson_period)
+        ] and request.user.has_perm("alsijil.view_assigned_grouproles", register_object)
         if show_group_roles:
-            groups = lesson_period.lesson.groups.all()
+            groups = register_object.get_groups().all()
             group_roles = GroupRole.objects.with_assignments(date_of_lesson, groups)
             context["group_roles"] = group_roles