diff --git a/app/models/form/lettings/pages/address_matcher.rb b/app/models/form/lettings/pages/address_matcher.rb
index 5c6f04478..2f19519b8 100644
--- a/app/models/form/lettings/pages/address_matcher.rb
+++ b/app/models/form/lettings/pages/address_matcher.rb
@@ -4,6 +4,7 @@ class Form::Lettings::Pages::AddressMatcher < ::Form::Page
     @id = "address_matcher"
     @header = "Find an address"
     @depends_on = [
+      { "is_supported_housing?" => false, "uprn_known" => nil },
       { "is_supported_housing?" => false, "uprn_known" => 0 },
       { "is_supported_housing?" => false, "uprn_confirmed" => 0 },
     ]
diff --git a/app/models/form/lettings/pages/address_selection.rb b/app/models/form/lettings/pages/address_selection.rb
index 291486593..5ad3de516 100644
--- a/app/models/form/lettings/pages/address_selection.rb
+++ b/app/models/form/lettings/pages/address_selection.rb
@@ -13,7 +13,7 @@ class Form::Lettings::Pages::AddressSelection < ::Form::Page
   end
 
   def routed_to?(log, _current_user = nil)
-    log.uprn_known.present? && log.uprn_known.zero? && log.address_line1_input.present? && log.postcode_full_input.present? && (1..10).cover?(log.address_options&.count)
+    (log.uprn_known.nil? || log.uprn_known.zero?) && log.address_line1_input.present? && log.postcode_full_input.present? && (1..10).cover?(log.address_options&.count)
   end
 
   def skip_text
diff --git a/app/services/address_client.rb b/app/services/address_client.rb
index 2f0ded738..670fbe643 100644
--- a/app/services/address_client.rb
+++ b/app/services/address_client.rb
@@ -40,7 +40,7 @@ private
       query: address,
       key: ENV["OS_DATA_KEY"],
       maxresults: 10,
-      minmatch: 0.6,
+      minmatch: 0.4,
     }
     uri.query = URI.encode_www_form(params)
     uri.to_s