diff --git a/messages/uniworx/categories/authorization/de-de-formal.msg b/messages/uniworx/categories/authorization/de-de-formal.msg
index 59e143d25..f54b3e7eb 100644
--- a/messages/uniworx/categories/authorization/de-de-formal.msg
+++ b/messages/uniworx/categories/authorization/de-de-formal.msg
@@ -88,7 +88,7 @@ UnauthorizedWorkflowWorkflowsNotEmpty: Es gibt laufende Workflows, die Sie einse
 UnauthorizedWorkflowFiles: Sie dürfen die angegebenen Workflow-Dateien nicht im angegebenen historischen Zustand herunterladen
 UnauthorizedStudent: Sie sind nicht Student:in
 
-UnauthorizedCorrectionExamTime: Visibility restrictions of the relevant exam are restricting access.
+UnauthorizedCorrectionExamTime: Sichtbarkeitseinstellungen der relevanten Prüfung verhindern momentan die Freigabe.
 
 WorkflowRoleUserMismatch: Sie sind nicht einer der vom Workflow geforderten Benutzer
 WorkflowRoleAlreadyInitiated: Dieser Workflow wurde bereits initiiert
diff --git a/messages/uniworx/categories/authorization/en-eu.msg b/messages/uniworx/categories/authorization/en-eu.msg
index 84835fa27..76a623a42 100644
--- a/messages/uniworx/categories/authorization/en-eu.msg
+++ b/messages/uniworx/categories/authorization/en-eu.msg
@@ -88,7 +88,7 @@ UnauthorizedWorkflowWorkflowsNotEmpty: There are running workflows, which you ma
 UnauthorizedWorkflowFiles: You are not allowed to download the given workflow files in the given historical state
 UnauthorizedStudent: You are not a student.
 
-UnauthorizedCorrectionExamTime: Sichtbarkeitseinstellungen der relevanten Prüfung verhindern momentan die Freigabe.
+UnauthorizedCorrectionExamTime: Visibility restrictions of the relevant exam are restricting access.
 
 WorkflowRoleUserMismatch: You aren't any of the users authorized by the workflow
 WorkflowRoleAlreadyInitiated: This workflow was already initiated
diff --git a/src/Handler/Exam/Form.hs b/src/Handler/Exam/Form.hs
index 0e930fc77..98bc2be9a 100644
--- a/src/Handler/Exam/Form.hs
+++ b/src/Handler/Exam/Form.hs
@@ -430,7 +430,7 @@ validateExam cId oldExam = do
   guardValidation MsgExamDeregisterUntilMustBeAfterRegisterFrom            $ NTop efDeregisterUntil              >= NTop efRegisterFrom
   guardValidation MsgExamStartMustBeAfterPublishOccurrenceAssignments      $ Just False /= ((>=) <$> efStart <*> efPublishOccurrenceAssignments)
   guardValidation MsgExamEndMustBeAfterStart                               $ NTop efEnd                          >= NTop efStart
-  guardValidation MsgExamFinishedMustBeAfterEnd                            $ Just False /= ((>=) <$> efFinished <*> efEnd)
+  warnValidation  MsgExamFinishedMustBeAfterEnd                            $ Just False /= ((>=) <$> efFinished <*> efEnd)
   guardValidation MsgExamFinishedMustBeAfterStart                          $ Just False /= ((>=) <$> efFinished <*> efStart)
   guardValidation MsgExamPartsFromMustBeBeforeFinished                     $ NTop efFinished                     >= NTop efPartsFrom
                                                                           || is _Nothing efPartsFrom
diff --git a/templates/i18n/changelog/exam-finished-before-end.de-de-formal.hamlet b/templates/i18n/changelog/exam-finished-before-end.de-de-formal.hamlet
new file mode 100644
index 000000000..2c3a5ab35
--- /dev/null
+++ b/templates/i18n/changelog/exam-finished-before-end.de-de-formal.hamlet
@@ -0,0 +1,2 @@
+$newline never
+Für die Einzelfälle in denen es sinnvoll ist, kann bei Prüfungen nun „_{MsgExamFinished}“ auch vor „_{MsgExamEnd}“ eingestellt werden.
diff --git a/templates/i18n/changelog/exam-finished-before-end.en-eu.hamlet b/templates/i18n/changelog/exam-finished-before-end.en-eu.hamlet
new file mode 100644
index 000000000..49001763a
--- /dev/null
+++ b/templates/i18n/changelog/exam-finished-before-end.en-eu.hamlet
@@ -0,0 +1,2 @@
+$newline never
+For the rare cases in which it is sensible to do so, “_{MsgExamFinished}” can now be set to be before “_{MsgExamEnd}” for exams.