diff --git a/templates/exam-correct.hamlet b/templates/exam-correct.hamlet
index 9abfdc8d7..672311742 100644
--- a/templates/exam-correct.hamlet
+++ b/templates/exam-correct.hamlet
@@ -2,16 +2,16 @@ $newline never
 
 <section>
   <div uw-hide-columns="exam-correct">
-    <table .table .table--striped uw-exam-correct=#{examCorrectIdent} uw-sort-table=#{examCorrectIdent}>
+    <table .table .table--striped table--hover uw-exam-correct=#{examCorrectIdent} uw-sort-table=#{examCorrectIdent}>
       <thead>
         <tr .table__row .table__row--head>
-          <th .table__th .sortable .sorted-desc uw-hide-column-header="date">
+          <th .table__th .sortable .sorted-desc uw-exam-correct-header="date" uw-hide-column-header="date">
             _{MsgExamCorrectHeadDate}
-          <th .table__th .sortable uw-hide-column-header="participant">
+          <th .table__th .sortable uw-exam-correct-header="user" uw-hide-column-header="user">
             _{MsgExamCorrectHeadParticipant}
             ^{iconTooltip participantHeadTooltip Nothing True}
           $forall ExamPart{examPartNumber,examPartName} <- examParts
-            <th .table__th .sortable uw-hide-column-header=#{examPartNumber}>
+            <th .table__th .sortable uw-exam-correct-header=#{examPartNumber} uw-hide-column-header=#{examPartNumber}>
               $maybe name <- examPartName
                 <span .tooltip>
                   <span>
@@ -20,13 +20,13 @@ $newline never
                     _{MsgExamCorrectHeadPartName name}
               $nothing
                 _{MsgExamCorrectHeadPart examPartNumber}
-          <th .table__th .sortable uw-hide-column-header="status">
+          <th .table__th .sortable uw-exam-correct-header="status" uw-hide-column-header="status">
             _{MsgExamCorrectHeadStatus}
       <tbody #exam-correct__new>
         <tr .table__row>
           <td .table__td>
           <td .table__td .exam-correct--input-status>
-            <input #exam-correct__user type="text">
+            <input #exam-correct__user type="text" autofocus minLength=1>
             <i #exam-correct__user-status .fas .fa-fw>
             <ul #exam-correct__user-candidates>
           $forall ExamPart{examPartNumber} <- examParts