diff --git a/app/models/form/sales/subsections/household_characteristics.rb b/app/models/form/sales/subsections/household_characteristics.rb
index fb2b7dc6e..5a8eeef83 100644
--- a/app/models/form/sales/subsections/household_characteristics.rb
+++ b/app/models/form/sales/subsections/household_characteristics.rb
@@ -4,7 +4,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
     @id = "household_characteristics"
     @label = "Household characteristics"
     @section = section
-    @depends_on = [{ "setup" => "completed" }]
+    @depends_on = [{ "setup_completed?" => true }]
   end
 
   def pages
diff --git a/app/models/form/sales/subsections/household_needs.rb b/app/models/form/sales/subsections/household_needs.rb
index bf7a5df3a..a85cadcf3 100644
--- a/app/models/form/sales/subsections/household_needs.rb
+++ b/app/models/form/sales/subsections/household_needs.rb
@@ -4,7 +4,7 @@ class Form::Sales::Subsections::HouseholdNeeds < ::Form::Subsection
     @id = "household_needs"
     @label = "Household needs"
     @section = section
-    @depends_on = [{ "setup" => "completed" }]
+    @depends_on = [{ "setup_completed?" => true }]
   end
 
   def pages
diff --git a/app/models/form/sales/subsections/income_benefits_and_outgoings.rb b/app/models/form/sales/subsections/income_benefits_and_outgoings.rb
index 2c9d779b4..6ec5c6488 100644
--- a/app/models/form/sales/subsections/income_benefits_and_outgoings.rb
+++ b/app/models/form/sales/subsections/income_benefits_and_outgoings.rb
@@ -4,7 +4,7 @@ class Form::Sales::Subsections::IncomeBenefitsAndOutgoings < ::Form::Subsection
     @id = "income_benefits_and_outgoings"
     @label = "Income, benefits and outgoings"
     @section = section
-    @depends_on = [{ "setup" => "completed" }]
+    @depends_on = [{ "setup_completed?" => true }]
   end
 
   def pages
diff --git a/app/models/form/sales/subsections/property_information.rb b/app/models/form/sales/subsections/property_information.rb
index 5ebe7b581..2a29e27c2 100644
--- a/app/models/form/sales/subsections/property_information.rb
+++ b/app/models/form/sales/subsections/property_information.rb
@@ -4,7 +4,7 @@ class Form::Sales::Subsections::PropertyInformation < ::Form::Subsection
     @id = "property_information"
     @label = "Property information"
     @section = section
-    @depends_on = [{ "setup" => "completed" }]
+    @depends_on = [{ "setup_completed?" => true }]
   end
 
   def pages
diff --git a/app/models/sales_log.rb b/app/models/sales_log.rb
index e1458caa9..88f0d299e 100644
--- a/app/models/sales_log.rb
+++ b/app/models/sales_log.rb
@@ -47,4 +47,8 @@ class SalesLog < Log
   def completed?
     status == "completed"
   end
+
+  def setup_completed?
+    form.setup_sections.first.subsections.first.status(self) == :completed
+  end
 end
diff --git a/spec/models/form/sales/subsections/household_characteristics_spec.rb b/spec/models/form/sales/subsections/household_characteristics_spec.rb
index dbe8a24a3..7aec7d56a 100644
--- a/spec/models/form/sales/subsections/household_characteristics_spec.rb
+++ b/spec/models/form/sales/subsections/household_characteristics_spec.rb
@@ -53,6 +53,6 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model
   end
 
   it "has correct depends on" do
-    expect(household_characteristics.depends_on).to eq([{ "setup" => "completed" }])
+    expect(household_characteristics.depends_on).to eq([{ "setup_completed?" => true }])
   end
 end
diff --git a/spec/models/form/sales/subsections/income_benefits_and_outgoings_spec.rb b/spec/models/form/sales/subsections/income_benefits_and_outgoings_spec.rb
index add0a6952..01028b0a8 100644
--- a/spec/models/form/sales/subsections/income_benefits_and_outgoings_spec.rb
+++ b/spec/models/form/sales/subsections/income_benefits_and_outgoings_spec.rb
@@ -28,6 +28,6 @@ RSpec.describe Form::Sales::Subsections::IncomeBenefitsAndOutgoings, type: :mode
   end
 
   it "has correct depends on" do
-    expect(subsection.depends_on).to eq([{ "setup" => "completed" }])
+    expect(subsection.depends_on).to eq([{ "setup_completed?" => true }])
   end
 end