diff --git a/app/models/form/sales/subsections/setup.rb b/app/models/form/sales/subsections/setup.rb
index 42eac8f6f..db91e261f 100644
--- a/app/models/form/sales/subsections/setup.rb
+++ b/app/models/form/sales/subsections/setup.rb
@@ -8,6 +8,8 @@ class Form::Sales::Subsections::Setup < ::Form::Subsection
 
   def pages
     @pages ||= [
+      Form::Common::Pages::Organisation.new(nil, nil, self),
+      Form::Common::Pages::CreatedBy.new(nil, nil, self),
       Form::Sales::Pages::PurchaserCode.new(nil, nil, self),
       Form::Sales::Pages::SaleDate.new(nil, nil, self),
     ]
diff --git a/spec/models/form/sales/subsections/setup_spec.rb b/spec/models/form/sales/subsections/setup_spec.rb
index 61f501576..ca2c09e76 100644
--- a/spec/models/form/sales/subsections/setup_spec.rb
+++ b/spec/models/form/sales/subsections/setup_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe Form::Sales::Subsections::Setup, type: :model do
 
   it "has correct pages" do
     expect(setup.pages.map(&:id)).to eq(
-      %w[purchaser_code sale_date],
+      %w[organisation created_by purchaser_code sale_date],
     )
   end
 
diff --git a/spec/models/form_spec.rb b/spec/models/form_spec.rb
index 204023885..0d0ba0fef 100644
--- a/spec/models/form_spec.rb
+++ b/spec/models/form_spec.rb
@@ -218,10 +218,10 @@ RSpec.describe Form, type: :model do
       expect(form.sections[0].class).to eq(Form::Sales::Sections::Setup)
       expect(form.subsections.count).to eq(1)
       expect(form.subsections.first.id).to eq("setup")
-      expect(form.pages.count).to eq(2)
-      expect(form.pages.first.id).to eq("purchaser_code")
-      expect(form.questions.count).to eq(2)
-      expect(form.questions.first.id).to eq("purchid")
+      expect(form.pages.count).to eq(4)
+      expect(form.pages.first.id).to eq("organisation")
+      expect(form.questions.count).to eq(4)
+      expect(form.questions.first.id).to eq("owning_organisation_id")
       expect(form.start_date).to eq(Time.zone.parse("2022-04-01"))
       expect(form.end_date).to eq(Time.zone.parse("2023-07-01"))
     end