diff --git a/app/models/form/lettings/questions/age.rb b/app/models/form/lettings/questions/age.rb
index f160f1948..c1054cead 100644
--- a/app/models/form/lettings/questions/age.rb
+++ b/app/models/form/lettings/questions/age.rb
@@ -11,5 +11,6 @@ class Form::Lettings::Questions::Age < ::Form::Question
     @max = 120
     @min = 0
     @step = 1
+    @question_number = 31 + 4 * person_index
   end
 end
diff --git a/app/models/form/lettings/questions/age1.rb b/app/models/form/lettings/questions/age1.rb
index 24512af28..2f43ac7ab 100644
--- a/app/models/form/lettings/questions/age1.rb
+++ b/app/models/form/lettings/questions/age1.rb
@@ -11,5 +11,6 @@ class Form::Lettings::Questions::Age1 < ::Form::Question
     @max = 120
     @min = 16
     @step = 1
+    @question_number = 32
   end
 end
diff --git a/app/models/form/lettings/questions/age1_known.rb b/app/models/form/lettings/questions/age1_known.rb
index d9899eb12..aaf28e68a 100644
--- a/app/models/form/lettings/questions/age1_known.rb
+++ b/app/models/form/lettings/questions/age1_known.rb
@@ -10,6 +10,7 @@ class Form::Lettings::Questions::Age1Known < ::Form::Question
     @answer_options = ANSWER_OPTIONS
     @conditional_for = { "age1" => [0] }
     @hidden_in_check_answers = { "depends_on" => [{ "age1_known" => 0 }, { "age1_known" => 1 }] }
+    @question_number = 32
   end
 
   ANSWER_OPTIONS = { "0" => { "value" => "Yes" }, "1" => { "value" => "No" } }.freeze
diff --git a/app/models/form/lettings/questions/age_known.rb b/app/models/form/lettings/questions/age_known.rb
index b7682c769..8ad41fae0 100644
--- a/app/models/form/lettings/questions/age_known.rb
+++ b/app/models/form/lettings/questions/age_known.rb
@@ -15,6 +15,7 @@ class Form::Lettings::Questions::AgeKnown < ::Form::Question
         { "age#{person_index}_known" => 1 },
       ],
     }
+    @question_number = 31 + 4 * person_index
   end
 
   ANSWER_OPTIONS = { "0" => { "value" => "Yes" }, "1" => { "value" => "No" } }.freeze
diff --git a/app/models/form/lettings/questions/declaration.rb b/app/models/form/lettings/questions/declaration.rb
index a342fba6d..742545b96 100644
--- a/app/models/form/lettings/questions/declaration.rb
+++ b/app/models/form/lettings/questions/declaration.rb
@@ -3,11 +3,12 @@ class Form::Lettings::Questions::Declaration < ::Form::Question
     super
     @id = "declaration"
     @check_answer_label = "Tenant has seen the privacy notice"
-    @header = ""
+    @header = "Declaration"
     @type = "checkbox"
     @check_answers_card_number = 0
     @guidance_partial = "privacy_notice_tenant"
     @answer_options = ANSWER_OPTIONS
+    @question_number = 30
   end
 
   ANSWER_OPTIONS = { "declaration" => { "value" => "The tenant has seen the DLUHC privacy notice" } }.freeze
diff --git a/app/models/form/lettings/questions/ethnic_arab.rb b/app/models/form/lettings/questions/ethnic_arab.rb
index 28b3591da..9884b69f0 100644
--- a/app/models/form/lettings/questions/ethnic_arab.rb
+++ b/app/models/form/lettings/questions/ethnic_arab.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::EthnicArab < ::Form::Question
     @check_answers_card_number = 1
     @hint_text = "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest."
     @answer_options = ANSWER_OPTIONS
+    @question_number = 35
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/ethnic_asian.rb b/app/models/form/lettings/questions/ethnic_asian.rb
index 96b8df9b5..17aa29d44 100644
--- a/app/models/form/lettings/questions/ethnic_asian.rb
+++ b/app/models/form/lettings/questions/ethnic_asian.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::EthnicAsian < ::Form::Question
     @check_answers_card_number = 1
     @hint_text = "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest."
     @answer_options = ANSWER_OPTIONS
+    @question_number = 35
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/ethnic_black.rb b/app/models/form/lettings/questions/ethnic_black.rb
index 68beca8ad..c6f0c81d5 100644
--- a/app/models/form/lettings/questions/ethnic_black.rb
+++ b/app/models/form/lettings/questions/ethnic_black.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::EthnicBlack < ::Form::Question
     @check_answers_card_number = 1
     @hint_text = "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest."
     @answer_options = ANSWER_OPTIONS
+    @question_number = 35
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/ethnic_group.rb b/app/models/form/lettings/questions/ethnic_group.rb
index 4f7364296..f9e392089 100644
--- a/app/models/form/lettings/questions/ethnic_group.rb
+++ b/app/models/form/lettings/questions/ethnic_group.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::EthnicGroup < ::Form::Question
     @check_answers_card_number = 1
     @hint_text = "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest."
     @answer_options = ANSWER_OPTIONS
+    @question_number = 34
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/ethnic_mixed.rb b/app/models/form/lettings/questions/ethnic_mixed.rb
index 6160e40a5..ac059837d 100644
--- a/app/models/form/lettings/questions/ethnic_mixed.rb
+++ b/app/models/form/lettings/questions/ethnic_mixed.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::EthnicMixed < ::Form::Question
     @check_answers_card_number = 1
     @hint_text = "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest."
     @answer_options = ANSWER_OPTIONS
+    @question_number = 35
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/ethnic_white.rb b/app/models/form/lettings/questions/ethnic_white.rb
index 993237a44..707330175 100644
--- a/app/models/form/lettings/questions/ethnic_white.rb
+++ b/app/models/form/lettings/questions/ethnic_white.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::EthnicWhite < ::Form::Question
     @check_answers_card_number = 1
     @hint_text = "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest."
     @answer_options = ANSWER_OPTIONS
+    @question_number = 35
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/gender_identity1.rb b/app/models/form/lettings/questions/gender_identity1.rb
index 2f5c8f45e..769dc1850 100644
--- a/app/models/form/lettings/questions/gender_identity1.rb
+++ b/app/models/form/lettings/questions/gender_identity1.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::GenderIdentity1 < ::Form::Question
     @check_answers_card_number = 1
     @hint_text = "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest."
     @answer_options = ANSWER_OPTIONS
+    @question_number = 33
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/hhmemb.rb b/app/models/form/lettings/questions/hhmemb.rb
index 3c6e6c3af..fee0aced3 100644
--- a/app/models/form/lettings/questions/hhmemb.rb
+++ b/app/models/form/lettings/questions/hhmemb.rb
@@ -11,5 +11,6 @@ class Form::Lettings::Questions::Hhmemb < ::Form::Question
     @min = 1
     @hint_text = "You can provide details for a maximum of 8 people."
     @step = 1
+    @question_number = 31
   end
 end
diff --git a/app/models/form/lettings/questions/joint.rb b/app/models/form/lettings/questions/joint.rb
index 484678f2b..7b1d9c2c9 100644
--- a/app/models/form/lettings/questions/joint.rb
+++ b/app/models/form/lettings/questions/joint.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::Joint < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
+    @question_number = 25
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/national.rb b/app/models/form/lettings/questions/national.rb
index 0bfe198e0..1e0b4a3d7 100644
--- a/app/models/form/lettings/questions/national.rb
+++ b/app/models/form/lettings/questions/national.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::National < ::Form::Question
     @check_answers_card_number = 1
     @hint_text = "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest."
     @answer_options = ANSWER_OPTIONS
+    @question_number = 36
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/person_gender_identity.rb b/app/models/form/lettings/questions/person_gender_identity.rb
index cb8f04ef2..58ee173ea 100644
--- a/app/models/form/lettings/questions/person_gender_identity.rb
+++ b/app/models/form/lettings/questions/person_gender_identity.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::PersonGenderIdentity < ::Form::Question
     @check_answers_card_number = person_index
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
+    @question_number = 32 + 4 * person_index
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/person_relationship.rb b/app/models/form/lettings/questions/person_relationship.rb
index debb14a03..c561d43de 100644
--- a/app/models/form/lettings/questions/person_relationship.rb
+++ b/app/models/form/lettings/questions/person_relationship.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::PersonRelationship < ::Form::Question
     @check_answers_card_number = person_index
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
+    @question_number = 30 + 4 * person_index
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/person_working_situation.rb b/app/models/form/lettings/questions/person_working_situation.rb
index 9174930a2..2dc283bc4 100644
--- a/app/models/form/lettings/questions/person_working_situation.rb
+++ b/app/models/form/lettings/questions/person_working_situation.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::PersonWorkingSituation < ::Form::Question
     @check_answers_card_number = person_index
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
+    @question_number = 33 + 4 * person_index
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/sheltered.rb b/app/models/form/lettings/questions/sheltered.rb
index 47899e261..1037ec9f5 100644
--- a/app/models/form/lettings/questions/sheltered.rb
+++ b/app/models/form/lettings/questions/sheltered.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::Sheltered < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
+    @question_number = 29
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/starter_tenancy.rb b/app/models/form/lettings/questions/starter_tenancy.rb
index 9e489c129..6cc86c02d 100644
--- a/app/models/form/lettings/questions/starter_tenancy.rb
+++ b/app/models/form/lettings/questions/starter_tenancy.rb
@@ -9,6 +9,7 @@ class Form::Lettings::Questions::StarterTenancy < ::Form::Question
     @hint_text = "This is also known as an ‘introductory period’."
     @answer_options = ANSWER_OPTIONS
     @conditional_for = { "tenancyother" => [3] }
+    @question_number = 27
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/startertenancy.rb b/app/models/form/lettings/questions/startertenancy.rb
index 8ae35bb02..10f5946d3 100644
--- a/app/models/form/lettings/questions/startertenancy.rb
+++ b/app/models/form/lettings/questions/startertenancy.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::Startertenancy < ::Form::Question
     @check_answers_card_number = 0
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
+    @question_number = 26
   end
 
   ANSWER_OPTIONS = { "1" => { "value" => "Yes" }, "2" => { "value" => "No" } }.freeze
diff --git a/app/models/form/lettings/questions/tenancy.rb b/app/models/form/lettings/questions/tenancy.rb
index 06a8d4fce..c8b5f9f35 100644
--- a/app/models/form/lettings/questions/tenancy.rb
+++ b/app/models/form/lettings/questions/tenancy.rb
@@ -9,6 +9,7 @@ class Form::Lettings::Questions::Tenancy < ::Form::Question
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
     @conditional_for = { "tenancyother" => [3] }
+    @question_number = 27
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/tenancylength.rb b/app/models/form/lettings/questions/tenancylength.rb
index 426a95669..53fc93c4b 100644
--- a/app/models/form/lettings/questions/tenancylength.rb
+++ b/app/models/form/lettings/questions/tenancylength.rb
@@ -11,5 +11,6 @@ class Form::Lettings::Questions::Tenancylength < ::Form::Question
     @min = 0
     @hint_text = "Don’t include the starter or introductory period."
     @step = 1
+    @question_number = 28
   end
 end
diff --git a/app/models/form/lettings/questions/tenancyother.rb b/app/models/form/lettings/questions/tenancyother.rb
index 468d592aa..e011cdb11 100644
--- a/app/models/form/lettings/questions/tenancyother.rb
+++ b/app/models/form/lettings/questions/tenancyother.rb
@@ -7,5 +7,6 @@ class Form::Lettings::Questions::Tenancyother < ::Form::Question
     @type = "text"
     @check_answers_card_number = 0
     @hint_text = ""
+    @question_number = 27
   end
 end
diff --git a/app/models/form/lettings/questions/working_situation1.rb b/app/models/form/lettings/questions/working_situation1.rb
index 20f5dc984..4975b4125 100644
--- a/app/models/form/lettings/questions/working_situation1.rb
+++ b/app/models/form/lettings/questions/working_situation1.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::WorkingSituation1 < ::Form::Question
     @check_answers_card_number = 1
     @hint_text = "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest."
     @answer_options = ANSWER_OPTIONS
+    @question_number = 37
   end
 
   ANSWER_OPTIONS = {