diff --git a/app/models/form/question.rb b/app/models/form/question.rb
index 70248ece8..fc05efe03 100644
--- a/app/models/form/question.rb
+++ b/app/models/form/question.rb
@@ -37,7 +37,7 @@ class Form::Question
       @suffix = hsh["suffix"]
       @requires_js = hsh["requires_js"]
       @fields_added = hsh["fields_added"]
-      @check_answers_card_number = hsh["check_answers_card_number"]
+      @check_answers_card_number = hsh["check_answers_card_number"] || 0
     end
   end
 
diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json
index 4abe314f8..2ed0f3fdc 100644
--- a/config/forms/2021_2022.json
+++ b/config/forms/2021_2022.json
@@ -1812,6 +1812,7 @@
                   },
                   "header": "Are you sure this person is retired?",
                   "type": "interruption_screen",
+                  "check_answers_card_number": 1,
                   "answer_options": {
                     "0": {
                       "value": "Yes"
@@ -1865,6 +1866,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 1,
                   "header": "Are you sure this person isn’t retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -2328,6 +2330,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 2,
                   "header": "Are you sure this person is retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -2383,6 +2386,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 2,
                   "header": "Are you sure this person isn’t retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -2843,6 +2847,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 3,
                   "header": "Are you sure this person is retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -2898,6 +2903,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 3,
                   "header": "Are you sure this person isn’t retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -3355,6 +3361,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 4,
                   "header": "Are you sure this person is retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -3410,6 +3417,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 4,
                   "header": "Are you sure this person isn’t retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -3864,6 +3872,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 5,
                   "header": "Are you sure this person is retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -3919,6 +3928,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 5,
                   "header": "Are you sure this person isn’t retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -4370,6 +4380,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 6,
                   "header": "Are you sure this person is retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -4425,6 +4436,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 6,
                   "header": "Are you sure this person isn’t retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -4873,6 +4885,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 7,
                   "header": "Are you sure this person is retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -4928,6 +4941,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 7,
                   "header": "Are you sure this person isn’t retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -5373,6 +5387,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 8,
                   "header": "Are you sure this person is retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -5428,6 +5443,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 8,
                   "header": "Are you sure this person isn’t retired?",
                   "type": "interruption_screen",
                   "answer_options": {
diff --git a/config/forms/2022_2023.json b/config/forms/2022_2023.json
index 9f3df73e1..190fa04bd 100644
--- a/config/forms/2022_2023.json
+++ b/config/forms/2022_2023.json
@@ -1809,6 +1809,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 1,
                   "header": "Are you sure this person is retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -1864,6 +1865,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 1,
                   "header": "Are you sure this person isn’t retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -2327,6 +2329,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 2,
                   "header": "Are you sure this person is retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -2382,6 +2385,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 2,
                   "header": "Are you sure this person isn’t retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -2842,6 +2846,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 3,
                   "header": "Are you sure this person is retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -2897,6 +2902,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 3,
                   "header": "Are you sure this person isn’t retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -3354,6 +3360,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 4,
                   "header": "Are you sure this person is retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -3409,6 +3416,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 4,
                   "header": "Are you sure this person isn’t retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -3863,6 +3871,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 5,
                   "header": "Are you sure this person is retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -3918,6 +3927,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 5,
                   "header": "Are you sure this person isn’t retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -4369,6 +4379,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 6,
                   "header": "Are you sure this person is retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -4424,6 +4435,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 6,
                   "header": "Are you sure this person isn’t retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -4872,6 +4884,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 7,
                   "header": "Are you sure this person is retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -4927,6 +4940,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 7,
                   "header": "Are you sure this person isn’t retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -5372,6 +5386,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 8,
                   "header": "Are you sure this person is retired?",
                   "type": "interruption_screen",
                   "answer_options": {
@@ -5427,6 +5442,7 @@
                       }
                     ]
                   },
+                  "check_answers_card_number": 8,
                   "header": "Are you sure this person isn’t retired?",
                   "type": "interruption_screen",
                   "answer_options": {