diff --git a/app/controllers/case_logs_controller.rb b/app/controllers/case_logs_controller.rb
index 22e6cb599..f853f556e 100644
--- a/app/controllers/case_logs_controller.rb
+++ b/app/controllers/case_logs_controller.rb
@@ -29,6 +29,7 @@ class CaseLogsController < ApplicationController
   def create
     case_log = CaseLog.create(case_log_params)
     respond_to do |format|
+      case_log.form.current_user = current_user
       format.html { redirect_to case_log }
       format.json do
         if case_log.persisted?
diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json
index 1cce9a7a6..de5bbf3d7 100644
--- a/config/forms/2021_2022.json
+++ b/config/forms/2021_2022.json
@@ -18,15 +18,14 @@
                   "hint_text": "",
                   "type": "select",
                   "answer_options": {
-                    "1": {
-                      "value": "General needs"
-                    },
-                    "2": {
-                      "value": "Supported housing"
-                    }
-                  }
+                    "": "Select an option",
+                    "2": "Believe",
+                    "3": "Barrow"
+                  },
+                  "hidden_in_check_answers": true
                 }
               },
+              "derived": true,
               "depends_on": [
                 [
                   {
diff --git a/config/forms/2022_2023.json b/config/forms/2022_2023.json
index 691cbbd2d..0eb09aa6b 100644
--- a/config/forms/2022_2023.json
+++ b/config/forms/2022_2023.json
@@ -22,15 +22,14 @@
                       "hint_text": "",
                       "type": "select",
                       "answer_options": {
-                        "1": {
-                          "value": "General needs"
-                        },
-                        "2": {
-                          "value": "Supported housing"
-                        }
-                      }
+                        "": "Select an option",
+                        "2": "Believe",
+                        "3": "Barrow"
+                      },
+                      "hidden_in_check_answers": true
                     }
                   },
+                  "derived": true,
                   "depends_on": [
                     [
                       {