diff --git a/app/models/form.rb b/app/models/form.rb
index e86596288..61a970bf9 100644
--- a/app/models/form.rb
+++ b/app/models/form.rb
@@ -357,4 +357,12 @@ class Form
   def start_year_2026_or_later?
     start_date && start_date.year >= 2026
   end
+
+  def person_question_count
+    if form.start_year_2026_or_later?
+      5
+    else
+      4
+    end
+  end
 end
diff --git a/app/models/form/lettings/questions/age.rb b/app/models/form/lettings/questions/age.rb
index 7621f9474..61e70fe05 100644
--- a/app/models/form/lettings/questions/age.rb
+++ b/app/models/form/lettings/questions/age.rb
@@ -29,13 +29,7 @@ class Form::Lettings::Questions::Age < ::Form::Question
                              27
                            end
 
-    person_question_count = if form.start_year_2026_or_later?
-                              5
-                            else
-                              4
-                            end
-
-    base_question_number + (person_question_count * @person_index)
+    base_question_number + (form.person_question_count * @person_index)
   end
 
   def hint_text
diff --git a/app/models/form/lettings/questions/person_partner.rb b/app/models/form/lettings/questions/person_partner.rb
index e3d00a17a..c7b673131 100644
--- a/app/models/form/lettings/questions/person_partner.rb
+++ b/app/models/form/lettings/questions/person_partner.rb
@@ -31,13 +31,7 @@ class Form::Lettings::Questions::PersonPartner < ::Form::Question
                              28
                            end
 
-    person_question_count = if form.start_year_2026_or_later?
-                              5
-                            else
-                              4
-                            end
-
-    base_question_number + (person_question_count * @person_index)
+    base_question_number + (form.person_question_count * @person_index)
   end
 
   def derived?(log)
diff --git a/app/models/form/lettings/questions/person_working_situation.rb b/app/models/form/lettings/questions/person_working_situation.rb
index 4129fbf03..0089416fb 100644
--- a/app/models/form/lettings/questions/person_working_situation.rb
+++ b/app/models/form/lettings/questions/person_working_situation.rb
@@ -67,12 +67,6 @@ class Form::Lettings::Questions::PersonWorkingSituation < ::Form::Question
                              31
                            end
 
-    person_question_count = if form.start_year_2026_or_later?
-                              5
-                            else
-                              4
-                            end
-
-    base_question_number + (person_question_count * @person_index)
+    base_question_number + (form.person_question_count * @person_index)
   end
 end