diff --git a/app/models/form/lettings/pages/stock_owner.rb b/app/models/form/lettings/pages/stock_owner.rb
index d92824f0e..0ff937582 100644
--- a/app/models/form/lettings/pages/stock_owner.rb
+++ b/app/models/form/lettings/pages/stock_owner.rb
@@ -17,6 +17,9 @@ class Form::Lettings::Pages::StockOwner < ::Form::Page
     stock_owners = current_user.organisation.stock_owners
 
     if current_user.organisation.holds_own_stock?
+      if current_user.organisation.absorbed_organisations.any?(&:holds_own_stock?)
+        return true
+      end
       return true if stock_owners.count >= 1
 
       log.update!(owning_organisation: current_user.organisation)
diff --git a/app/models/form/sales/pages/organisation.rb b/app/models/form/sales/pages/organisation.rb
index 1d61b86ac..2a3d1f63b 100644
--- a/app/models/form/sales/pages/organisation.rb
+++ b/app/models/form/sales/pages/organisation.rb
@@ -11,6 +11,6 @@ class Form::Sales::Pages::Organisation < ::Form::Page
   end
 
   def routed_to?(_log, current_user)
-    !!current_user&.support?
+    !!current_user&.support? || current_user&.organisation&.absorbed_organisations.present?
   end
 end
diff --git a/app/models/form/sales/questions/owning_organisation_id.rb b/app/models/form/sales/questions/owning_organisation_id.rb
index fa838f744..d2087b50b 100644
--- a/app/models/form/sales/questions/owning_organisation_id.rb
+++ b/app/models/form/sales/questions/owning_organisation_id.rb
@@ -7,31 +7,57 @@ class Form::Sales::Questions::OwningOrganisationId < ::Form::Question
     @type = "select"
   end
 
-  def answer_options
+  def answer_options(log = nil, user = nil)
     answer_opts = { "" => "Select an option" }
+
     return answer_opts unless ActiveRecord::Base.connected?
+    return answer_opts unless user
+    return answer_opts unless log
+
+    if log.owning_organisation_id.present?
+      answer_opts = answer_opts.merge({ log.owning_organisation.id => log.owning_organisation.name })
+    end
 
-    Organisation.select(:id, :name).each_with_object(answer_opts) do |organisation, hsh|
-      hsh[organisation.id] = organisation.name
-      hsh
+    if !user.support? && user.organisation.holds_own_stock?
+      answer_opts[user.organisation.id] = "#{user.organisation.name} (Your organisation)"
     end
+
+    user_answer_options = if user.support?
+                            Organisation.where(holds_own_stock: true)
+                          else
+                            user.organisation.stock_owners + user.organisation.absorbed_organisations.where(holds_own_stock: true)
+                          end.pluck(:id, :name).to_h
+
+    answer_opts.merge(user_answer_options)
   end
 
-  def displayed_answer_options(_log, _user = nil)
-    answer_options
+  def displayed_answer_options(log, user = nil)
+    answer_options(log, user)
   end
 
-  def label_from_value(value, _log = nil, _user = nil)
+  def label_from_value(value, log = nil, user = nil)
     return unless value
 
-    answer_options[value]
+    answer_options(log, user)[value]
   end
 
-  def hidden_in_check_answers?(_log, current_user)
-    !current_user.support?
+  def derived?
+    true
   end
 
-  def derived?
+  def hidden_in_check_answers?(_log, user = nil)
+    return false if user.support?
+
+    stock_owners = user.organisation.stock_owners
+
+    if user.organisation.holds_own_stock?
+      stock_owners.count.zero?
+    else
+      stock_owners.count <= 1
+    end
+  end
+
+  def enabled
     true
   end