diff --git a/app/models/form/sales/pages/building_type.rb b/app/models/form/sales/pages/building_type.rb
index f37319ee1..1005c7b9f 100644
--- a/app/models/form/sales/pages/building_type.rb
+++ b/app/models/form/sales/pages/building_type.rb
@@ -1,7 +1,7 @@
 class Form::Sales::Pages::BuildingType < ::Form::Page
   def initialize(id, hsh, subsection)
     super
-    @id = "builtype"
+    @id = "property_building_type"
     @header = ""
     @description = ""
     @subsection = subsection
diff --git a/app/models/form/sales/subsections/property_information.rb b/app/models/form/sales/subsections/property_information.rb
index 6a0287de4..dee530487 100644
--- a/app/models/form/sales/subsections/property_information.rb
+++ b/app/models/form/sales/subsections/property_information.rb
@@ -11,6 +11,7 @@ class Form::Sales::Subsections::PropertyInformation < ::Form::Subsection
     @pages ||= [
       Form::Sales::Pages::PropertyNumberOfBedrooms.new(nil, nil, self),
       Form::Sales::Pages::PropertyUnitType.new(nil, nil, self),
+      Form::Sales::Pages::BuildingType.new(nil, nil, self),
     ]
   end
 end
diff --git a/app/models/form/sales/subsections/setup.rb b/app/models/form/sales/subsections/setup.rb
index b9ba89dcf..f39926db3 100644
--- a/app/models/form/sales/subsections/setup.rb
+++ b/app/models/form/sales/subsections/setup.rb
@@ -20,7 +20,6 @@ class Form::Sales::Subsections::Setup < ::Form::Subsection
       Form::Sales::Pages::BuyerLive.new(nil, nil, self),
       Form::Sales::Pages::JointPurchase.new(nil, nil, self),
       Form::Sales::Pages::NumberJointBuyers.new(nil, nil, self),
-      Form::Sales::Pages::BuildingType.new(nil, nil, self),
     ]
   end
 end