diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json
index b48b042a6..18abeb761 100644
--- a/config/forms/2021_2022.json
+++ b/config/forms/2021_2022.json
@@ -1075,8 +1075,8 @@
               "description": "",
               "questions": {
                 "tenancy": {
-                  "check_answer_label": "Type of main tenancy (after any starter/introductory period)",
-                  "header": "What is the type of tenancy after the starter period has ended?",
+                  "check_answer_label": "Type of main tenancy",
+                  "header": "What is the type of tenancy?",
                   "hint_text": "",
                   "type": "radio",
                   "answer_options": {
@@ -1095,22 +1095,52 @@
                   "hint_text": "",
                   "type": "text"
                 }
-              }
+              },
+              "depends_on": { "starter_tenancy": "No" }
+            },
+            "tenancy_type_starter_text": {
+              "header": "",
+              "description": "",
+              "questions": {
+                "tenancy": {
+                  "check_answer_label": "Type of main tenancy after the starter period has ended?",
+                  "header": "What is the type of tenancy after the starter period has ended?",
+                  "hint_text": "This is also known as an 'introductory period'.",
+                  "type": "radio",
+                  "answer_options": {
+                    "0": "Secure (including flexible)",
+                    "1": "Assured",
+                    "2": "Assured Shorthold",
+                    "3": "Licence agreement (almshouses only)",
+                    "4": "Other"
+                  },
+                  "conditional_for": {
+                    "tenancyother": ["Other"]
+                  }
+                },
+                "tenancyother": {
+                  "header": "Please state the tenancy type",
+                  "hint_text": "",
+                  "type": "text"
+                }
+              },
+              "depends_on": { "starter_tenancy": "Yes" }
             },
             "fixed_term_tenancy": {
               "header": "",
               "description": "",
               "questions": {
                 "tenancylength": {
-                  "check_answer_label": "If the main tenancy is a fixed term tenancy, please provide the length of the fixed term (to the nearest year) excluding any starter/introductory period",
-                  "header": "If fixed-term, what is the length of the fixed-term tenancy after any starter period?",
-                  "hint_text": "To the nearest year",
+                  "check_answer_label": "Length of fixed-term tenancy",
+                  "header": "What is the length of the fixed-term tenancy to the nearest year?",
+                  "hint_text": "",
                   "type": "numeric",
                   "min": 0,
                   "max": 150,
                   "step": 1
                 }
-              }
+              },
+              "depends_on": { "tenancy": ["Secure (including flexible)", "Assured Shorthold"] }
             },
             "letting_in_sheltered_accomodation": {
               "header": "",
@@ -1128,7 +1158,8 @@
                     "3": "Don't know"
                   }
                 }
-              }
+              },
+              "depends_on": { "needstype": "Supported housing" }
             }
           }
         },