diff --git a/app/models/form/lettings/questions/benefits.rb b/app/models/form/lettings/questions/benefits.rb
index 27f90053d..3d23c50a1 100644
--- a/app/models/form/lettings/questions/benefits.rb
+++ b/app/models/form/lettings/questions/benefits.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::Benefits < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = "This excludes child and housing benefit, council tax support and tax credits."
     @answer_options = ANSWER_OPTIONS
+    @question_number = 90
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/brent_4_weekly.rb b/app/models/form/lettings/questions/brent_4_weekly.rb
index c7659dbd4..39f7c8bd4 100644
--- a/app/models/form/lettings/questions/brent_4_weekly.rb
+++ b/app/models/form/lettings/questions/brent_4_weekly.rb
@@ -15,5 +15,6 @@ class Form::Lettings::Questions::Brent4Weekly < ::Form::Question
     @hidden_in_check_answers = true
     @prefix = "£"
     @suffix = " every 4 weeks"
+    @question_number = 95
   end
 end
diff --git a/app/models/form/lettings/questions/brent_bi_weekly.rb b/app/models/form/lettings/questions/brent_bi_weekly.rb
index 7b1e1d04e..1eee6b705 100644
--- a/app/models/form/lettings/questions/brent_bi_weekly.rb
+++ b/app/models/form/lettings/questions/brent_bi_weekly.rb
@@ -15,5 +15,6 @@ class Form::Lettings::Questions::BrentBiWeekly < ::Form::Question
     @hidden_in_check_answers = true
     @prefix = "£"
     @suffix = " every 2 weeks"
+    @question_number = 95
   end
 end
diff --git a/app/models/form/lettings/questions/brent_monthly.rb b/app/models/form/lettings/questions/brent_monthly.rb
index c58a21175..9bed45aef 100644
--- a/app/models/form/lettings/questions/brent_monthly.rb
+++ b/app/models/form/lettings/questions/brent_monthly.rb
@@ -15,5 +15,6 @@ class Form::Lettings::Questions::BrentMonthly < ::Form::Question
     @hidden_in_check_answers = true
     @prefix = "£"
     @suffix = " every month"
+    @question_number = 95
   end
 end
diff --git a/app/models/form/lettings/questions/brent_weekly.rb b/app/models/form/lettings/questions/brent_weekly.rb
index 0ea1f5359..831f0308f 100644
--- a/app/models/form/lettings/questions/brent_weekly.rb
+++ b/app/models/form/lettings/questions/brent_weekly.rb
@@ -15,5 +15,6 @@ class Form::Lettings::Questions::BrentWeekly < ::Form::Question
     @hidden_in_check_answers = true
     @prefix = "£"
     @suffix = " every week"
+    @question_number = 95
   end
 end
diff --git a/app/models/form/lettings/questions/chcharge_4_weekly.rb b/app/models/form/lettings/questions/chcharge_4_weekly.rb
index c755a933b..6e0923cc0 100644
--- a/app/models/form/lettings/questions/chcharge_4_weekly.rb
+++ b/app/models/form/lettings/questions/chcharge_4_weekly.rb
@@ -11,5 +11,6 @@ class Form::Lettings::Questions::Chcharge4Weekly < ::Form::Question
     @step = 0.01
     @prefix = "£"
     @suffix = " every 4 weeks"
+    @question_number = 94
   end
 end
diff --git a/app/models/form/lettings/questions/chcharge_bi_weekly.rb b/app/models/form/lettings/questions/chcharge_bi_weekly.rb
index e65dc59a1..273ec7ac0 100644
--- a/app/models/form/lettings/questions/chcharge_bi_weekly.rb
+++ b/app/models/form/lettings/questions/chcharge_bi_weekly.rb
@@ -11,5 +11,6 @@ class Form::Lettings::Questions::ChchargeBiWeekly < ::Form::Question
     @step = 0.01
     @prefix = "£"
     @suffix = " every 2 weeks"
+    @question_number = 94
   end
 end
diff --git a/app/models/form/lettings/questions/chcharge_monthly.rb b/app/models/form/lettings/questions/chcharge_monthly.rb
index f0bc7bb82..ab2da34ad 100644
--- a/app/models/form/lettings/questions/chcharge_monthly.rb
+++ b/app/models/form/lettings/questions/chcharge_monthly.rb
@@ -11,5 +11,6 @@ class Form::Lettings::Questions::ChchargeMonthly < ::Form::Question
     @step = 0.01
     @prefix = "£"
     @suffix = " every month"
+    @question_number = 94
   end
 end
diff --git a/app/models/form/lettings/questions/chcharge_weekly.rb b/app/models/form/lettings/questions/chcharge_weekly.rb
index 874259215..96b8de324 100644
--- a/app/models/form/lettings/questions/chcharge_weekly.rb
+++ b/app/models/form/lettings/questions/chcharge_weekly.rb
@@ -11,5 +11,6 @@ class Form::Lettings::Questions::ChchargeWeekly < ::Form::Question
     @step = 0.01
     @prefix = "£"
     @suffix = " every week"
+    @question_number = 94
   end
 end
diff --git a/app/models/form/lettings/questions/earnings.rb b/app/models/form/lettings/questions/earnings.rb
index 2647d0179..445710f09 100644
--- a/app/models/form/lettings/questions/earnings.rb
+++ b/app/models/form/lettings/questions/earnings.rb
@@ -17,5 +17,6 @@ class Form::Lettings::Questions::Earnings < ::Form::Question
       { "label" => " every month", "depends_on" => { "incfreq" => 2 } },
       { "label" => " every year", "depends_on" => { "incfreq" => 3 } },
     ]
+    @question_number = 88
   end
 end
diff --git a/app/models/form/lettings/questions/hb.rb b/app/models/form/lettings/questions/hb.rb
index e8da0e146..68dfc987b 100644
--- a/app/models/form/lettings/questions/hb.rb
+++ b/app/models/form/lettings/questions/hb.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::Hb < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
+    @question_number = 89
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/hbrentshortfall.rb b/app/models/form/lettings/questions/hbrentshortfall.rb
index 687ac3aeb..828c36377 100644
--- a/app/models/form/lettings/questions/hbrentshortfall.rb
+++ b/app/models/form/lettings/questions/hbrentshortfall.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::Hbrentshortfall < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = "Also known as the ‘outstanding amount’."
     @answer_options = ANSWER_OPTIONS
+    @question_number = 99
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/household_charge.rb b/app/models/form/lettings/questions/household_charge.rb
index 1a8ade65a..da77cb361 100644
--- a/app/models/form/lettings/questions/household_charge.rb
+++ b/app/models/form/lettings/questions/household_charge.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::HouseholdCharge < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = "If rent is charged on the property then answer Yes to this question, even if the tenants do not pay it themselves."
     @answer_options = ANSWER_OPTIONS
+    @question_number = 91
   end
 
   ANSWER_OPTIONS = { "0" => { "value" => "Yes" }, "1" => { "value" => "No" } }.freeze
diff --git a/app/models/form/lettings/questions/incfreq.rb b/app/models/form/lettings/questions/incfreq.rb
index 0d347c0da..c31f23fd5 100644
--- a/app/models/form/lettings/questions/incfreq.rb
+++ b/app/models/form/lettings/questions/incfreq.rb
@@ -9,6 +9,7 @@ class Form::Lettings::Questions::Incfreq < ::Form::Question
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
     @hidden_in_check_answers = true
+    @question_number = 87
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/is_carehome.rb b/app/models/form/lettings/questions/is_carehome.rb
index 6f17acc0d..9011d35bb 100644
--- a/app/models/form/lettings/questions/is_carehome.rb
+++ b/app/models/form/lettings/questions/is_carehome.rb
@@ -9,6 +9,7 @@ class Form::Lettings::Questions::IsCarehome < ::Form::Question
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
     @conditional_for = { "chcharge" => [1] }
+    @question_number = 93
   end
 
   ANSWER_OPTIONS = { "0" => { "value" => "No" }, "1" => { "value" => "Yes" } }.freeze
diff --git a/app/models/form/lettings/questions/net_income_known.rb b/app/models/form/lettings/questions/net_income_known.rb
index 5e9b1b4da..0bf1195fb 100644
--- a/app/models/form/lettings/questions/net_income_known.rb
+++ b/app/models/form/lettings/questions/net_income_known.rb
@@ -9,6 +9,7 @@ class Form::Lettings::Questions::NetIncomeKnown < ::Form::Question
     @guidance_partial = "what_counts_as_income"
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
+    @question_number = 86
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/period.rb b/app/models/form/lettings/questions/period.rb
index cf0b4d13a..08a8510c4 100644
--- a/app/models/form/lettings/questions/period.rb
+++ b/app/models/form/lettings/questions/period.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::Period < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
+    @question_number = 92
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/pscharge_4_weekly.rb b/app/models/form/lettings/questions/pscharge_4_weekly.rb
index 2242cd692..3e9274b3f 100644
--- a/app/models/form/lettings/questions/pscharge_4_weekly.rb
+++ b/app/models/form/lettings/questions/pscharge_4_weekly.rb
@@ -15,5 +15,6 @@ class Form::Lettings::Questions::Pscharge4Weekly < ::Form::Question
     @hidden_in_check_answers = true
     @prefix = "£"
     @suffix = " every 4 weeks"
+    @question_number = 97
   end
 end
diff --git a/app/models/form/lettings/questions/pscharge_bi_weekly.rb b/app/models/form/lettings/questions/pscharge_bi_weekly.rb
index 7a7c89443..706b9e14f 100644
--- a/app/models/form/lettings/questions/pscharge_bi_weekly.rb
+++ b/app/models/form/lettings/questions/pscharge_bi_weekly.rb
@@ -15,5 +15,6 @@ class Form::Lettings::Questions::PschargeBiWeekly < ::Form::Question
     @hidden_in_check_answers = true
     @prefix = "£"
     @suffix = " every 2 weeks"
+    @question_number = 97
   end
 end
diff --git a/app/models/form/lettings/questions/pscharge_monthly.rb b/app/models/form/lettings/questions/pscharge_monthly.rb
index 6aa1ae911..6b67dab05 100644
--- a/app/models/form/lettings/questions/pscharge_monthly.rb
+++ b/app/models/form/lettings/questions/pscharge_monthly.rb
@@ -15,5 +15,6 @@ class Form::Lettings::Questions::PschargeMonthly < ::Form::Question
     @hidden_in_check_answers = true
     @prefix = "£"
     @suffix = " every month"
+    @question_number = 97
   end
 end
diff --git a/app/models/form/lettings/questions/pscharge_weekly.rb b/app/models/form/lettings/questions/pscharge_weekly.rb
index 73f3d9323..d8623a4ba 100644
--- a/app/models/form/lettings/questions/pscharge_weekly.rb
+++ b/app/models/form/lettings/questions/pscharge_weekly.rb
@@ -15,5 +15,6 @@ class Form::Lettings::Questions::PschargeWeekly < ::Form::Question
     @hidden_in_check_answers = true
     @prefix = "£"
     @suffix = " every week"
+    @question_number = 97
   end
 end
diff --git a/app/models/form/lettings/questions/scharge_4_weekly.rb b/app/models/form/lettings/questions/scharge_4_weekly.rb
index 418c88157..e94c95055 100644
--- a/app/models/form/lettings/questions/scharge_4_weekly.rb
+++ b/app/models/form/lettings/questions/scharge_4_weekly.rb
@@ -15,5 +15,6 @@ class Form::Lettings::Questions::Scharge4Weekly < ::Form::Question
     @hidden_in_check_answers = true
     @prefix = "£"
     @suffix = " every 4 weeks"
+    @question_number = 96
   end
 end
diff --git a/app/models/form/lettings/questions/scharge_bi_weekly.rb b/app/models/form/lettings/questions/scharge_bi_weekly.rb
index 913f49844..a38b39a2b 100644
--- a/app/models/form/lettings/questions/scharge_bi_weekly.rb
+++ b/app/models/form/lettings/questions/scharge_bi_weekly.rb
@@ -15,5 +15,6 @@ class Form::Lettings::Questions::SchargeBiWeekly < ::Form::Question
     @hidden_in_check_answers = true
     @prefix = "£"
     @suffix = " every 2 weeks"
+    @question_number = 96
   end
 end
diff --git a/app/models/form/lettings/questions/scharge_monthly.rb b/app/models/form/lettings/questions/scharge_monthly.rb
index bec02543c..f7059d73c 100644
--- a/app/models/form/lettings/questions/scharge_monthly.rb
+++ b/app/models/form/lettings/questions/scharge_monthly.rb
@@ -15,5 +15,6 @@ class Form::Lettings::Questions::SchargeMonthly < ::Form::Question
     @hidden_in_check_answers = true
     @prefix = "£"
     @suffix = " every month"
+    @question_number = 96
   end
 end
diff --git a/app/models/form/lettings/questions/scharge_weekly.rb b/app/models/form/lettings/questions/scharge_weekly.rb
index 11e79c111..48ab7190f 100644
--- a/app/models/form/lettings/questions/scharge_weekly.rb
+++ b/app/models/form/lettings/questions/scharge_weekly.rb
@@ -15,5 +15,6 @@ class Form::Lettings::Questions::SchargeWeekly < ::Form::Question
     @hidden_in_check_answers = true
     @prefix = "£"
     @suffix = " every week"
+    @question_number = 96
   end
 end
diff --git a/app/models/form/lettings/questions/supcharg_4_weekly.rb b/app/models/form/lettings/questions/supcharg_4_weekly.rb
index 5540b3555..b851d7275 100644
--- a/app/models/form/lettings/questions/supcharg_4_weekly.rb
+++ b/app/models/form/lettings/questions/supcharg_4_weekly.rb
@@ -15,5 +15,6 @@ class Form::Lettings::Questions::Supcharg4Weekly < ::Form::Question
     @hidden_in_check_answers = true
     @prefix = "£"
     @suffix = " every 4 weeks"
+    @question_number = 98
   end
 end
diff --git a/app/models/form/lettings/questions/supcharg_bi_weekly.rb b/app/models/form/lettings/questions/supcharg_bi_weekly.rb
index cbda5e5c9..e85865e82 100644
--- a/app/models/form/lettings/questions/supcharg_bi_weekly.rb
+++ b/app/models/form/lettings/questions/supcharg_bi_weekly.rb
@@ -15,5 +15,6 @@ class Form::Lettings::Questions::SupchargBiWeekly < ::Form::Question
     @hidden_in_check_answers = true
     @prefix = "£"
     @suffix = " every 2 weeks"
+    @question_number = 98
   end
 end
diff --git a/app/models/form/lettings/questions/supcharg_monthly.rb b/app/models/form/lettings/questions/supcharg_monthly.rb
index 6b799f547..b57fac306 100644
--- a/app/models/form/lettings/questions/supcharg_monthly.rb
+++ b/app/models/form/lettings/questions/supcharg_monthly.rb
@@ -15,5 +15,6 @@ class Form::Lettings::Questions::SupchargMonthly < ::Form::Question
     @hidden_in_check_answers = true
     @prefix = "£"
     @suffix = " every month"
+    @question_number = 98
   end
 end
diff --git a/app/models/form/lettings/questions/supcharg_weekly.rb b/app/models/form/lettings/questions/supcharg_weekly.rb
index 6f843db94..5499b997c 100644
--- a/app/models/form/lettings/questions/supcharg_weekly.rb
+++ b/app/models/form/lettings/questions/supcharg_weekly.rb
@@ -15,5 +15,6 @@ class Form::Lettings::Questions::SupchargWeekly < ::Form::Question
     @hidden_in_check_answers = true
     @prefix = "£"
     @suffix = " every week"
+    @question_number = 98
   end
 end
diff --git a/app/models/form/lettings/questions/tshortfall.rb b/app/models/form/lettings/questions/tshortfall.rb
index ca88f3e81..af8d32c9c 100644
--- a/app/models/form/lettings/questions/tshortfall.rb
+++ b/app/models/form/lettings/questions/tshortfall.rb
@@ -21,5 +21,6 @@ class Form::Lettings::Questions::Tshortfall < ::Form::Question
       { "label" => " every week for 46 weeks", "depends_on" => { "period" => 9 } },
       { "label" => " every week for 52 weeks", "depends_on" => { "period" => 1 } },
     ]
+    @question_number = 100
   end
 end
diff --git a/app/models/form/lettings/questions/tshortfall_known.rb b/app/models/form/lettings/questions/tshortfall_known.rb
index 4f934d75a..7082af4f3 100644
--- a/app/models/form/lettings/questions/tshortfall_known.rb
+++ b/app/models/form/lettings/questions/tshortfall_known.rb
@@ -9,6 +9,7 @@ class Form::Lettings::Questions::TshortfallKnown < ::Form::Question
     @hint_text = "You only need to give an approximate figure."
     @answer_options = ANSWER_OPTIONS
     @conditional_for = { "tshortfall" => [0] }
+    @question_number = 100
   end
 
   ANSWER_OPTIONS = { "0" => { "value" => "Yes" }, "1" => { "value" => "No" } }.freeze