diff --git a/src/Handler/Utils/ExamOffice/Exam.hs b/src/Handler/Utils/ExamOffice/Exam.hs
index 272a9771f..32248dc7b 100644
--- a/src/Handler/Utils/ExamOffice/Exam.hs
+++ b/src/Handler/Utils/ExamOffice/Exam.hs
@@ -36,9 +36,9 @@ examOfficeExamResultAuth :: E.SqlExpr (E.Value UserId) -- ^ office
 examOfficeExamResultAuth authId examResult = authByUser E.||. authByField E.||. authBySchool
   where
     authByField = E.exists . E.from $ \(course `E.InnerJoin` examOfficeField `E.InnerJoin` studyFeatures) -> do
+      E.on $ studyFeatures E.^. StudyFeaturesField E.==. examOfficeField E.^. ExamOfficeFieldField
       E.on $ isCourseStudyFeature course studyFeatures
        E.&&. course E.^. CourseId E.==. E.subSelectForeign examResult ExamResultExam (\exam -> E.subSelectForeign exam ExamCourse (E.^. CourseId))
-      E.on $ studyFeatures E.^. StudyFeaturesField E.==. examOfficeField E.^. ExamOfficeFieldField
       E.where_ $ studyFeatures E.^. StudyFeaturesUser E.==. examResult E.^. ExamResultUser
            E.&&. examOfficeField E.^. ExamOfficeFieldOffice E.==. authId
            E.&&. examOfficeField E.^. ExamOfficeFieldField E.==. studyFeatures E.^. StudyFeaturesField
diff --git a/src/Handler/Utils/ExamOffice/ExternalExam.hs b/src/Handler/Utils/ExamOffice/ExternalExam.hs
index c509516a4..7d9c177d3 100644
--- a/src/Handler/Utils/ExamOffice/ExternalExam.hs
+++ b/src/Handler/Utils/ExamOffice/ExternalExam.hs
@@ -36,9 +36,9 @@ examOfficeExternalExamResultAuth :: E.SqlExpr (E.Value UserId) -- ^ office
 examOfficeExternalExamResultAuth authId eexamResult = authByUser E.||. authByField E.||. authBySchool E.||. authByExtraSchool
   where
     authByField = E.exists . E.from $ \(externalExam `E.InnerJoin` examOfficeField `E.InnerJoin` studyFeatures) -> do
+      E.on $ studyFeatures E.^. StudyFeaturesField E.==. examOfficeField E.^. ExamOfficeFieldField
       E.on $ isExternalExamStudyFeature externalExam studyFeatures
        E.&&. externalExam E.^. ExternalExamId E.==. eexamResult E.^. ExternalExamResultExam
-      E.on $ studyFeatures E.^. StudyFeaturesField E.==. examOfficeField E.^. ExamOfficeFieldField
       E.where_ $ studyFeatures E.^. StudyFeaturesUser E.==. eexamResult E.^. ExternalExamResultUser
            E.&&. examOfficeField E.^. ExamOfficeFieldOffice E.==. authId
            E.&&. examOfficeField E.^. ExamOfficeFieldField E.==. studyFeatures E.^. StudyFeaturesField