diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4d06e9d0..554165533 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [20.5.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v20.5.0...v20.5.1) (2020-09-29)
+
+
+### Bug Fixes
+
+* **exams:** default exam mode to Nothing ([4b459ea](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/4b459ea1430a4947364562f1a9881596325696ad))
+
 ## [20.5.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v20.4.1...v20.5.0) (2020-09-28)
 
 
diff --git a/package-lock.json b/package-lock.json
index aee8c3bc1..5b316b3f5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "20.5.0",
+  "version": "20.5.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0b40fcf94..796b4d1cf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "20.5.0",
+  "version": "20.5.1",
   "description": "",
   "keywords": [],
   "author": "",
diff --git a/package.yaml b/package.yaml
index 1d75cf1ed..650a37fbf 100644
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name:    uniworx
-version: 20.5.0
+version: 20.5.1
 
 dependencies:
   - base
diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index 868324424..9e0dff4d4 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -2013,9 +2013,9 @@ customPresetForm :: forall a custom preset msg.
                  -> Maybe (Maybe a)
                  -> AForm Handler (Maybe a)
 customPresetForm cpL noneOption customOption toOption customForm fs mPrev
-  = explainedMultiActionA actionMap options fs mPrev'
+  = explainedMultiActionA actionMap options fs $ Just mPrev'
   where
-    mPrev' = flip fmap mPrev $ preview (_Just . cpL) >>> \case
+    mPrev' = case mPrev ^? _Just . _Just . cpL of
       Nothing        -> CPFONone
       Just (Left _)  -> CPFOCustom
       Just (Right p) -> CPFOPreset p