diff --git a/app/models/form/lettings/questions/homeless.rb b/app/models/form/lettings/questions/homeless.rb
index fcfc117d2..21a597a00 100644
--- a/app/models/form/lettings/questions/homeless.rb
+++ b/app/models/form/lettings/questions/homeless.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::Homeless < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
+    @question_number = 79
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/layear.rb b/app/models/form/lettings/questions/layear.rb
index 14a334399..764253250 100644
--- a/app/models/form/lettings/questions/layear.rb
+++ b/app/models/form/lettings/questions/layear.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::Layear < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
+    @question_number = 75
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/letting_allocation.rb b/app/models/form/lettings/questions/letting_allocation.rb
index e41f52b09..18c0a3042 100644
--- a/app/models/form/lettings/questions/letting_allocation.rb
+++ b/app/models/form/lettings/questions/letting_allocation.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::LettingAllocation < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = "Select all that apply."
     @answer_options = ANSWER_OPTIONS
+    @question_number = 84
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/ppcodenk.rb b/app/models/form/lettings/questions/ppcodenk.rb
index fa10f3d69..33b03d959 100644
--- a/app/models/form/lettings/questions/ppcodenk.rb
+++ b/app/models/form/lettings/questions/ppcodenk.rb
@@ -10,6 +10,7 @@ class Form::Lettings::Questions::Ppcodenk < ::Form::Question
     @answer_options = ANSWER_OPTIONS
     @conditional_for = { "ppostcode_full" => [1] }
     @hidden_in_check_answers = { "depends_on" => [{ "ppcodenk" => 0 }, { "ppcodenk" => 1 }] }
+    @question_number = 80
   end
 
   ANSWER_OPTIONS = { "1" => { "value" => "Yes" }, "0" => { "value" => "No" } }.freeze
diff --git a/app/models/form/lettings/questions/ppostcode_full.rb b/app/models/form/lettings/questions/ppostcode_full.rb
index 736e06f16..0432d1b5b 100644
--- a/app/models/form/lettings/questions/ppostcode_full.rb
+++ b/app/models/form/lettings/questions/ppostcode_full.rb
@@ -10,5 +10,6 @@ class Form::Lettings::Questions::PpostcodeFull < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = ""
     @inferred_answers = { "prevloc" => { "is_previous_la_inferred" => true } }
+    @question_number = 80
   end
 end
diff --git a/app/models/form/lettings/questions/previous_la_known.rb b/app/models/form/lettings/questions/previous_la_known.rb
index 0f563b62a..a9ff11e55 100644
--- a/app/models/form/lettings/questions/previous_la_known.rb
+++ b/app/models/form/lettings/questions/previous_la_known.rb
@@ -10,6 +10,7 @@ class Form::Lettings::Questions::PreviousLaKnown < ::Form::Question
     @answer_options = ANSWER_OPTIONS
     @conditional_for = { "prevloc" => [1] }
     @hidden_in_check_answers = { "depends_on" => [{ "previous_la_known" => 0 }, { "previous_la_known" => 1 }] }
+    @question_number = 81
   end
 
   ANSWER_OPTIONS = { "1" => { "value" => "Yes" }, "0" => { "value" => "No" } }.freeze
diff --git a/app/models/form/lettings/questions/prevloc.rb b/app/models/form/lettings/questions/prevloc.rb
index e5a433f3f..0a055ef4a 100644
--- a/app/models/form/lettings/questions/prevloc.rb
+++ b/app/models/form/lettings/questions/prevloc.rb
@@ -9,6 +9,7 @@ class Form::Lettings::Questions::Prevloc < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = "Select ‘Northern Ireland’, ‘Scotland’, ‘Wales’ or ‘Outside the UK’ if the household’s last settled home was outside England."
     @answer_options = ANSWER_OPTIONS
+    @question_number = 81
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/prevten.rb b/app/models/form/lettings/questions/prevten.rb
index 3d77f24bb..edc791c30 100644
--- a/app/models/form/lettings/questions/prevten.rb
+++ b/app/models/form/lettings/questions/prevten.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::Prevten < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = "This is where the household was the night before they moved."
     @answer_options = ANSWER_OPTIONS
+    @question_number = 78
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/prevten_renewal.rb b/app/models/form/lettings/questions/prevten_renewal.rb
index e8516e85e..759833bed 100644
--- a/app/models/form/lettings/questions/prevten_renewal.rb
+++ b/app/models/form/lettings/questions/prevten_renewal.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::PrevtenRenewal < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
+    @question_number = 78
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/reason.rb b/app/models/form/lettings/questions/reason.rb
index 2f46fae35..3e5d78944 100644
--- a/app/models/form/lettings/questions/reason.rb
+++ b/app/models/form/lettings/questions/reason.rb
@@ -13,6 +13,7 @@ class Form::Lettings::Questions::Reason < ::Form::Question
         20,
       ],
     }
+    @question_number = 77
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/reason_renewal.rb b/app/models/form/lettings/questions/reason_renewal.rb
index c3a825c5e..9111ad8e7 100644
--- a/app/models/form/lettings/questions/reason_renewal.rb
+++ b/app/models/form/lettings/questions/reason_renewal.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::ReasonRenewal < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
+    @question_number = 77
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/reasonable_preference_reason.rb b/app/models/form/lettings/questions/reasonable_preference_reason.rb
index f582ccadf..631949685 100644
--- a/app/models/form/lettings/questions/reasonable_preference_reason.rb
+++ b/app/models/form/lettings/questions/reasonable_preference_reason.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::ReasonablePreferenceReason < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = "Select all that apply."
     @answer_options = ANSWER_OPTIONS
+    @question_number = 83
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/reasonother.rb b/app/models/form/lettings/questions/reasonother.rb
index 48306f7d7..e045c9aa3 100644
--- a/app/models/form/lettings/questions/reasonother.rb
+++ b/app/models/form/lettings/questions/reasonother.rb
@@ -7,5 +7,6 @@ class Form::Lettings::Questions::Reasonother < ::Form::Question
     @type = "text"
     @check_answers_card_number = 0
     @hint_text = ""
+    @question_number = 77
   end
 end
diff --git a/app/models/form/lettings/questions/reasonpref.rb b/app/models/form/lettings/questions/reasonpref.rb
index 571a7e3eb..43631a2fd 100644
--- a/app/models/form/lettings/questions/reasonpref.rb
+++ b/app/models/form/lettings/questions/reasonpref.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::Reasonpref < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = "Households may be given ‘reasonable preference’ for social housing, also known as ‘priority need’, by the local authority."
     @answer_options = ANSWER_OPTIONS
+    @question_number = 82
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/referral.rb b/app/models/form/lettings/questions/referral.rb
index 83e5d3ae2..ca1e117a4 100644
--- a/app/models/form/lettings/questions/referral.rb
+++ b/app/models/form/lettings/questions/referral.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::Referral < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
+    @question_number = 85
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/referral_prp.rb b/app/models/form/lettings/questions/referral_prp.rb
index 5651f431f..a602beea8 100644
--- a/app/models/form/lettings/questions/referral_prp.rb
+++ b/app/models/form/lettings/questions/referral_prp.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::ReferralPrp < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
+    @question_number = 85
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/referral_supported_housing.rb b/app/models/form/lettings/questions/referral_supported_housing.rb
index 5b286d94d..12d24cd53 100644
--- a/app/models/form/lettings/questions/referral_supported_housing.rb
+++ b/app/models/form/lettings/questions/referral_supported_housing.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::ReferralSupportedHousing < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
+    @question_number = 85
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/referral_supported_housing_prp.rb b/app/models/form/lettings/questions/referral_supported_housing_prp.rb
index 051f7b90b..4824dd6c5 100644
--- a/app/models/form/lettings/questions/referral_supported_housing_prp.rb
+++ b/app/models/form/lettings/questions/referral_supported_housing_prp.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::ReferralSupportedHousingPrp < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
+    @question_number = 85
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/waityear.rb b/app/models/form/lettings/questions/waityear.rb
index 74239b775..569533a9d 100644
--- a/app/models/form/lettings/questions/waityear.rb
+++ b/app/models/form/lettings/questions/waityear.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::Waityear < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
+    @question_number = 76
   end
 
   ANSWER_OPTIONS = {