diff --git a/app/models/case_log.rb b/app/models/case_log.rb
index d2335cec5..c2422e599 100644
--- a/app/models/case_log.rb
+++ b/app/models/case_log.rb
@@ -225,7 +225,9 @@ private
   end
 
   def reset_derived_questions
-    dependent_questions = { layear: [{ key: :renewal, value: "No" }], homeless: [{ key: :renewal, value: "No" }] }
+    dependent_questions = { layear: [{ key: :renewal, value: "No" }],
+                            homeless: [{ key: :renewal, value: "No" }],
+                            referral: [{ key: :renewal, value: "No" }]}
 
     dependent_questions.each do |dependent, conditions|
       condition_key = conditions.first[:key]
@@ -283,6 +285,7 @@ private
       self.homeless = "No"
       self.referral = "Internal transfer"
       self.layear = "Less than 1 year"
+      self.reasonpref = nil if reasonpref == "Yes"
     end
     if needstype == "General needs"
       self.prevten = "Fixed-term private registered provider (PRP) general needs tenancy" if managing_organisation.provider_type == "PRP"