diff --git a/app/models/form/lettings/questions/uprn_confirmation.rb b/app/models/form/lettings/questions/uprn_confirmation.rb
index 5b7bbd535..1c31485b6 100644
--- a/app/models/form/lettings/questions/uprn_confirmation.rb
+++ b/app/models/form/lettings/questions/uprn_confirmation.rb
@@ -4,14 +4,22 @@ class Form::Lettings::Questions::UprnConfirmation < ::Form::Question
     @id = "uprn_confirmed"
     @header = "Is this the property address?"
     @type = "radio"
-    @answer_options = ANSWER_OPTIONS
     @check_answer_label = "Is this the right address?"
   end
 
-  ANSWER_OPTIONS = {
-    "1" => { "value" => "Yes" },
-    "0" => { "value" => "No, I want to enter the address manually" },
-  }.freeze
+  def answer_options
+    if form.start_year_after_2024?
+      {
+        "1" => { "value" => "Yes" },
+        "0" => { "value" => "No, I want to search for the address instead" },
+      }.freeze
+    else
+      {
+        "1" => { "value" => "Yes" },
+        "0" => { "value" => "No, I want to enter the address manually" },
+      }.freeze
+    end
+  end
 
   def notification_banner(log = nil)
     return unless log&.uprn
diff --git a/app/models/log.rb b/app/models/log.rb
index 5f17167c6..4c966d175 100644
--- a/app/models/log.rb
+++ b/app/models/log.rb
@@ -68,7 +68,7 @@ class Log < ApplicationRecord
 
       self.uprn_known = 1
       self.uprn_confirmed = nil unless skip_update_uprn_confirmed
-      self.address_selection = nil
+      self.address_selection = nil # unless skip_update_address_confirmed
       self.address_line1 = presenter.address_line1
       self.address_line2 = presenter.address_line2
       self.town_or_city = presenter.town_or_city
@@ -90,7 +90,7 @@ class Log < ApplicationRecord
         presenter = AddressDataPresenter.new(service.result[address_selection])
 
         self.uprn_known = 1
-        self.uprn_confirmed = 1
+        self.uprn_confirmed = nil # unless skip_update_uprn_confirmed
         self.address_selection = nil # unless skip_update_address_confirmed
         self.uprn = presenter.uprn # skip process uprn change?
         self.address_line1 = presenter.address_line1