diff --git a/aleksis/apps/alsijil/util/alsijil_helpers.py b/aleksis/apps/alsijil/util/alsijil_helpers.py
index a787888335f8c4305227a2822e5a18aca74e68c8..479dc8dd599da170f6ae8e7c968cc8b52da8833c 100644
--- a/aleksis/apps/alsijil/util/alsijil_helpers.py
+++ b/aleksis/apps/alsijil/util/alsijil_helpers.py
@@ -259,7 +259,7 @@ def generate_list_of_all_register_objects(filter_dict: Dict[str, Any]) -> List[d
 
                     # Build table entry
                     entry = {
-                        "pk": f"{lesson_period.pk}_{week.year}_{week.week}",
+                        "pk": f"lesson_period_{lesson_period.pk}_{week.year}_{week.week}",
                         "week": week,
                         "has_documentation": has_documentation,
                         "substitution": sub,
@@ -312,7 +312,7 @@ def generate_list_of_all_register_objects(filter_dict: Dict[str, Any]) -> List[d
 
             # Build table entry
             entry = {
-                "pk": str(register_object.pk),
+                "pk": f"{register_object.label_}_{register_object.pk}",
                 "has_documentation": has_documentation,
                 "register_object": register_object,
                 "date": day,