diff --git a/app/models/log.rb b/app/models/log.rb
index 4c4116a23..8c40b77e0 100644
--- a/app/models/log.rb
+++ b/app/models/log.rb
@@ -128,38 +128,40 @@ class Log < ApplicationRecord
     "#{address_line1_input}, #{postcode_full_input}"
   end
 
-  def address_options
-    if uprn.present?
-      service = UprnClient.new(uprn)
-      service.call
-      if service.result.blank? || service.error.present?
-        @address_options = []
-        return @address_options
-      end
+  def address_search_options
+    return if uprn.blank?
+
+    service = UprnClient.new(uprn)
+    service.call
+    if service.result.blank? || service.error.present?
+      @address_options = []
+      return @address_options
+    end
 
-      presenter = UprnDataPresenter.new(service.result)
-      @address_options = [{ address: presenter.address, uprn: presenter.uprn }]
-    else
-      return @address_options if @address_options && @last_searched_address_string == address_string
-      return if address_string.blank?
+    presenter = UprnDataPresenter.new(service.result)
+    @address_options = [{ address: presenter.address, uprn: presenter.uprn }]
+  end
 
-      @last_searched_address_string = address_string
+  def address_options
+    return @address_options if @address_options && @last_searched_address_string == address_string
+    return if address_string.blank?
 
-      service = AddressClient.new(address_string)
-      service.call
-      if service.result.blank? || service.error.present?
-        @address_options = []
-        return @address_options
-      end
+    @last_searched_address_string = address_string
 
-      address_opts = []
-      service.result.first(10).each do |result|
-        presenter = AddressDataPresenter.new(result)
-        address_opts.append({ address: presenter.address, uprn: presenter.uprn })
-      end
+    service = AddressClient.new(address_string)
+    service.call
+    if service.result.blank? || service.error.present?
+      @address_options = []
+      return @address_options
+    end
 
-      @address_options = address_opts
+    address_opts = []
+    service.result.first(10).each do |result|
+      presenter = AddressDataPresenter.new(result)
+      address_opts.append({ address: presenter.address, uprn: presenter.uprn })
     end
+
+    @address_options = address_opts
   end
 
   def collection_start_year