diff --git a/records.json b/records.json
index e9a1244c8..1df7d5606 100644
--- a/records.json
+++ b/records.json
@@ -815,18 +815,5 @@
         "usedIds": []
       }
     }
-  ],
-  "mini-css-extract-plugin node_modules/css-loader/dist/cjs.js??ref--6-1!node_modules/postcss-loader/src/index.js??ref--6-2!node_modules/resolve-url-loader/index.js??ref--6-3!node_modules/sass-loader/dist/cjs.js??ref--6-4!frontend/src/utils/inputs/radiobox.sass": [
-    {
-      "modules": {
-        "byIdentifier": {},
-        "usedIds": {}
-      },
-      "chunks": {
-        "byName": {},
-        "bySource": {},
-        "usedIds": []
-      }
-    }
   ]
 }
\ No newline at end of file
diff --git a/src/Handler/Allocation/Users.hs b/src/Handler/Allocation/Users.hs
index adad70bf3..6f792d22e 100644
--- a/src/Handler/Allocation/Users.hs
+++ b/src/Handler/Allocation/Users.hs
@@ -185,7 +185,8 @@ postAUsersR tid ssh ash = do
                     contents <- innerCell ^. cellContents
                     return $ if
                       | null courses -> contents
-                      | otherwise    -> $(widgetFile "table/cell/allocation-courses")
+                      | otherwise    -> let tooltipContent = $(widgetFile "table/cell/allocation-courses")
+                                          in $(widgetFile "widgets/tooltip_no-handle")
           dbtSorting = mconcat
             [ sortUserName' $ queryUser . $(multifocusG 2) (to (E.^. UserDisplayName)) (to (E.^. UserSurname))
             , sortUserMatriculation $ queryUser . to (E.^. UserMatrikelnummer)
diff --git a/src/Handler/Course/Users.hs b/src/Handler/Course/Users.hs
index 9340955c5..9d8f4dbad 100644
--- a/src/Handler/Course/Users.hs
+++ b/src/Handler/Course/Users.hs
@@ -507,7 +507,7 @@ postCUsersR tid ssh csh = do
           , pure $ colUserComment tid ssh csh
           ]
         psValidator = def & defaultSortingByName
-        hasExams = not $ null examOccurrencesPerExam
+        hasExams = not $ null exams
         examOccActs :: Map ExamId (AForm Handler (ExamId, Maybe ExamOccurrenceId))
         examOccActs = examOccurrencesPerExam
           & (map (bimap entityKey hoistMaybe)) 
@@ -541,9 +541,6 @@ postCUsersR tid ssh csh = do
                   Nothing
           , singletonMap CourseUserRegisterExam $ CourseUserRegisterExamData <$>
             multiActionAOpts examOccActs examActs (fslI MsgCourseExam) Nothing
-            --apopt (selectField' Nothing . fmap (fmap entityKey) $ optionsPersistCryptoId [ExamCourse ==. cid] [Asc ExamName] examName)
-            --      (fslI MsgCourseExam)
-            --      Nothing
           , if
               | mayRegister
                 -> singletonMap CourseUserDeregister $ courseUserDeregisterForm cid
diff --git a/templates/table/cell/allocation-courses.hamlet b/templates/table/cell/allocation-courses.hamlet
index 422932e55..f3bb50c70 100644
--- a/templates/table/cell/allocation-courses.hamlet
+++ b/templates/table/cell/allocation-courses.hamlet
@@ -1,9 +1,5 @@
 $newline never
-<div .tooltip .tooltip--spread .tooltip--no-handle>
-  <div>
-    ^{contents}
-  <div .tooltip__content>
-    <ul>
-      $forall Entity _ Course{courseTerm, courseSchool, courseName} <- courses
-        <li>
-          #{courseTerm} - #{courseSchool} - #{courseName}
+<ul>
+  $forall Entity _ Course{courseTerm, courseSchool, courseName} <- courses
+    <li>
+      #{courseTerm} - #{courseSchool} - #{courseName}
diff --git a/templates/widgets/tooltip_no-handle.hamlet b/templates/widgets/tooltip_no-handle.hamlet
new file mode 100644
index 000000000..0bcc8abd5
--- /dev/null
+++ b/templates/widgets/tooltip_no-handle.hamlet
@@ -0,0 +1,6 @@
+$newline never
+<div .tooltip .tooltip--spread .tooltip--no-handle>
+  <div>
+    ^{contents}
+  <div .tooltip__content>
+    ^{tooltipContent}