diff --git a/app/models/form/lettings/questions/beds.rb b/app/models/form/lettings/questions/beds.rb
index cc3ceb885..75d2a835d 100644
--- a/app/models/form/lettings/questions/beds.rb
+++ b/app/models/form/lettings/questions/beds.rb
@@ -11,5 +11,6 @@ class Form::Lettings::Questions::Beds < ::Form::Question
     @min = 0
     @hint_text = "If shared accommodation, enter the number of bedrooms occupied by this household. A bedsit has 1 bedroom."
     @step = 1
+    @question_number = 22
   end
 end
diff --git a/app/models/form/lettings/questions/builtype.rb b/app/models/form/lettings/questions/builtype.rb
index 087699e0d..9cda5649f 100644
--- a/app/models/form/lettings/questions/builtype.rb
+++ b/app/models/form/lettings/questions/builtype.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::Builtype < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
+    @question_number = 20
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/first_time_property_let_as_social_housing.rb b/app/models/form/lettings/questions/first_time_property_let_as_social_housing.rb
index 62f0bba19..132eca0c2 100644
--- a/app/models/form/lettings/questions/first_time_property_let_as_social_housing.rb
+++ b/app/models/form/lettings/questions/first_time_property_let_as_social_housing.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::FirstTimePropertyLetAsSocialHousing < ::Form::Q
     @check_answers_card_number = 0
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
+    @question_number = 14
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/la.rb b/app/models/form/lettings/questions/la.rb
index a25bdac10..6e8f7862c 100644
--- a/app/models/form/lettings/questions/la.rb
+++ b/app/models/form/lettings/questions/la.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::La < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
+    @question_number = 13
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/majorrepairs.rb b/app/models/form/lettings/questions/majorrepairs.rb
index e0a6fdb01..83acf76a6 100644
--- a/app/models/form/lettings/questions/majorrepairs.rb
+++ b/app/models/form/lettings/questions/majorrepairs.rb
@@ -9,6 +9,7 @@ class Form::Lettings::Questions::Majorrepairs < ::Form::Question
     @hint_text = "Major repairs are works that could not be reasonably carried out with a tenant living at the property. For example, structural repairs."
     @answer_options = ANSWER_OPTIONS
     @conditional_for = { "mrcdate" => [1] }
+    @question_number = 24
   end
 
   ANSWER_OPTIONS = { "1" => { "value" => "Yes" }, "0" => { "value" => "No" } }.freeze
diff --git a/app/models/form/lettings/questions/mrcdate.rb b/app/models/form/lettings/questions/mrcdate.rb
index a3718af47..cadcd3a7a 100644
--- a/app/models/form/lettings/questions/mrcdate.rb
+++ b/app/models/form/lettings/questions/mrcdate.rb
@@ -7,5 +7,6 @@ class Form::Lettings::Questions::Mrcdate < ::Form::Question
     @type = "date"
     @check_answers_card_number = 0
     @hint_text = "For example, 27 3 2021."
+    @question_number = 24
   end
 end
diff --git a/app/models/form/lettings/questions/offered.rb b/app/models/form/lettings/questions/offered.rb
index ebc2bac1b..c801a9e8b 100644
--- a/app/models/form/lettings/questions/offered.rb
+++ b/app/models/form/lettings/questions/offered.rb
@@ -11,5 +11,6 @@ class Form::Lettings::Questions::Offered < ::Form::Question
     @min = 0
     @hint_text = "This is after the last tenancy ended. If the property is being offered for let for the first time, enter 0."
     @step = 1
+    @question_number = 18
   end
 end
diff --git a/app/models/form/lettings/questions/offered_social_let.rb b/app/models/form/lettings/questions/offered_social_let.rb
index d2658a8e6..214dc6ed7 100644
--- a/app/models/form/lettings/questions/offered_social_let.rb
+++ b/app/models/form/lettings/questions/offered_social_let.rb
@@ -11,5 +11,6 @@ class Form::Lettings::Questions::OfferedSocialLet < ::Form::Question
     @min = 0
     @hint_text = "If the property is being offered for let for the first time, enter 0."
     @step = 1
+    @question_number = 18
   end
 end
diff --git a/app/models/form/lettings/questions/rsnvac.rb b/app/models/form/lettings/questions/rsnvac.rb
index 4968ebb2d..6b7ff2d58 100644
--- a/app/models/form/lettings/questions/rsnvac.rb
+++ b/app/models/form/lettings/questions/rsnvac.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::Rsnvac < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
+    @question_number = 17
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/rsnvac_first_let.rb b/app/models/form/lettings/questions/rsnvac_first_let.rb
index a97e743db..8d7da0433 100644
--- a/app/models/form/lettings/questions/rsnvac_first_let.rb
+++ b/app/models/form/lettings/questions/rsnvac_first_let.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::RsnvacFirstLet < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
+    @question_number = 15
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/unitletas.rb b/app/models/form/lettings/questions/unitletas.rb
index e37a07b34..88a20ded9 100644
--- a/app/models/form/lettings/questions/unitletas.rb
+++ b/app/models/form/lettings/questions/unitletas.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::Unitletas < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
+    @question_number = 16
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/unittype_gn.rb b/app/models/form/lettings/questions/unittype_gn.rb
index 82f582722..01f38b0b9 100644
--- a/app/models/form/lettings/questions/unittype_gn.rb
+++ b/app/models/form/lettings/questions/unittype_gn.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::UnittypeGn < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
+    @question_number = 19
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/voiddate.rb b/app/models/form/lettings/questions/voiddate.rb
index 78e57c1ee..a91ac6ddb 100644
--- a/app/models/form/lettings/questions/voiddate.rb
+++ b/app/models/form/lettings/questions/voiddate.rb
@@ -6,5 +6,6 @@ class Form::Lettings::Questions::Voiddate < ::Form::Question
     @header = "What is the void or renewal date?"
     @type = "date"
     @check_answers_card_number = 0
+    @question_number = 23
   end
 end
diff --git a/app/models/form/lettings/questions/voiddate_new_build.rb b/app/models/form/lettings/questions/voiddate_new_build.rb
index 9cda12522..dcf1326b0 100644
--- a/app/models/form/lettings/questions/voiddate_new_build.rb
+++ b/app/models/form/lettings/questions/voiddate_new_build.rb
@@ -7,5 +7,6 @@ class Form::Lettings::Questions::VoiddateNewBuild < ::Form::Question
     @type = "date"
     @check_answers_card_number = 0
     @hint_text = ""
+    @question_number = 23
   end
 end
diff --git a/app/models/form/lettings/questions/wheelchair.rb b/app/models/form/lettings/questions/wheelchair.rb
index a841c9b66..3ba4f081f 100644
--- a/app/models/form/lettings/questions/wheelchair.rb
+++ b/app/models/form/lettings/questions/wheelchair.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::Wheelchair < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
+    @question_number = 21
   end
 
   ANSWER_OPTIONS = {