diff --git a/src/Handler/ExamOffice/Exam.hs b/src/Handler/ExamOffice/Exam.hs
index 5ad1d0133..cde8a0015 100644
--- a/src/Handler/ExamOffice/Exam.hs
+++ b/src/Handler/ExamOffice/Exam.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fno-warn-redundant-constraints -fno-warn-name-shadowing #-}
+{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
 
 module Handler.ExamOffice.Exam
   ( getEGradesR, postEGradesR
@@ -227,7 +227,7 @@ data ExamUserCsvExportData = ExamUserCsvExportData
 getEGradesR, postEGradesR :: TermId -> SchoolId -> CourseShorthand -> ExamName -> Handler Html
 getEGradesR = postEGradesR
 postEGradesR tid ssh csh examn = do
-  Entity uid User{..} <- requireAuth
+  Entity uid User{userCsvOptions=csvOpts} <- requireAuth
   now <- liftIO getCurrentTime
   ((usersResult, examUsersTable), Entity eId Exam{examFinished}) <- runDB $ do
     exam@(Entity eid Exam{..}) <- fetchExam tid ssh csh examn
@@ -238,7 +238,7 @@ postEGradesR tid ssh csh examn = do
     userFunctions <- selectList [ UserFunctionUser ==. uid, UserFunctionFunction ==. SchoolExamOffice ] []
 
     userCsvExportLabel' <- E.select . E.from $ \examOfficeLabel -> do
-      E.where_ $ maybe E.false (\expLbl -> examOfficeLabel E.^. ExamOfficeLabelName E.==. E.val expLbl) (csvExportLabel userCsvOptions)
+      E.where_ $ maybe E.false (\expLbl -> examOfficeLabel E.^. ExamOfficeLabelName E.==. E.val expLbl) (csvExportLabel csvOpts)
                                      E.&&. examOfficeLabel E.^. ExamOfficeLabelUser E.==. E.val uid
       return examOfficeLabel
     let userCsvExportLabel = listToMaybe userCsvExportLabel'