diff --git a/app/main/forms.py b/app/main/forms.py
index 73cd485be..e40584b88 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -1182,16 +1182,21 @@ class OrganisationCrownStatusForm(StripWhitespaceForm):
 
 
 class OrganisationAgreementSignedForm(StripWhitespaceForm):
-    agreement_signed = RadioField(
-        (
-            'Has this organisation signed the agreement?'
-        ),
+    agreement_signed = GovukRadiosField(
+        'Has this organisation signed the agreement?',
         choices=[
             ('yes', 'Yes'),
             ('no', 'No'),
             ('unknown', 'No (but we have some service-specific agreements in place)'),
         ],
         thing='whether this organisation has signed the agreement',
+        param_extensions={
+            'items': [
+                {'hint': {'html': 'Users will be told their organisation has already signed the agreement'}},
+                {'hint': {'html': 'Users will be prompted to sign the agreement before they can go live'}},
+                {'hint': {'html': 'Users will not be prompted to sign the agreement'}}
+            ]
+        }
     )
 
 
diff --git a/app/templates/views/organisations/organisation/settings/edit-agreement.html b/app/templates/views/organisations/organisation/settings/edit-agreement.html
index f4672bfef..f4c44d99c 100644
--- a/app/templates/views/organisations/organisation/settings/edit-agreement.html
+++ b/app/templates/views/organisations/organisation/settings/edit-agreement.html
@@ -17,14 +17,7 @@
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-five-sixths">
       {% call form_wrapper() %}
-        {{ radios(
-          form.agreement_signed,
-          option_hints={
-            'yes': 'Users will be told their organisation has already signed the agreement',
-            'no': 'Users will be prompted to sign the agreement before they can go live',
-            'unknown': 'Users will not be prompted to sign the agreement'
-          }
-        ) }}
+        {{ form.agreement_signed }}
         {{ page_footer('Save') }}
       {% endcall %}
     </div>
diff --git a/tests/app/main/views/organisations/test_organisation.py b/tests/app/main/views/organisations/test_organisation.py
index c2e4f7a7d..28ee9606c 100644
--- a/tests/app/main/views/organisations/test_organisation.py
+++ b/tests/app/main/views/organisations/test_organisation.py
@@ -704,41 +704,44 @@ def test_organisation_settings_for_platform_admin(
     (
         '.edit_organisation_type',
         (
-            ('central', 'Central government'),
-            ('local', 'Local government'),
-            ('nhs_central', 'NHS – central government agency or public body'),
-            ('nhs_local', 'NHS Trust or Clinical Commissioning Group'),
-            ('nhs_gp', 'GP practice'),
-            ('emergency_service', 'Emergency service'),
-            ('school_or_college', 'School or college'),
-            ('other', 'Other'),
+            {'value': 'central', 'label': 'Central government'},
+            {'value': 'local', 'label': 'Local government'},
+            {'value': 'nhs_central', 'label': 'NHS – central government agency or public body'},
+            {'value': 'nhs_local', 'label': 'NHS Trust or Clinical Commissioning Group'},
+            {'value': 'nhs_gp', 'label': 'GP practice'},
+            {'value': 'emergency_service', 'label': 'Emergency service'},
+            {'value': 'school_or_college', 'label': 'School or college'},
+            {'value': 'other', 'label': 'Other'},
         ),
         'central',
     ),
     (
         '.edit_organisation_crown_status',
         (
-            ('crown', 'Yes'),
-            ('non-crown', 'No'),
-            ('unknown', 'Not sure'),
+            {'value': 'crown', 'label': 'Yes'},
+            {'value': 'non-crown', 'label': 'No'},
+            {'value': 'unknown', 'label': 'Not sure'},
         ),
         'crown',
     ),
     (
         '.edit_organisation_agreement',
         (
-            ('yes', (
-                'Yes '
-                'Users will be told their organisation has already signed the agreement'
-            )),
-            ('no', (
-                'No '
-                'Users will be prompted to sign the agreement before they can go live'
-            )),
-            ('unknown', (
-                'No (but we have some service-specific agreements in place) '
-                'Users will not be prompted to sign the agreement'
-            )),
+            {
+                'value': 'yes',
+                'label': 'Yes',
+                'hint': 'Users will be told their organisation has already signed the agreement'
+            },
+            {
+                'value': 'no',
+                'label': 'No',
+                'hint': 'Users will be prompted to sign the agreement before they can go live'
+            },
+            {
+                'value': 'unknown',
+                'label': 'No (but we have some service-specific agreements in place)',
+                'hint': 'Users will not be prompted to sign the agreement'
+            },
         ),
         'no',
     ),
@@ -769,11 +772,14 @@ def test_view_organisation_settings(
     radios = page.select('input[type=radio]')
 
     for index, option in enumerate(expected_options):
-        label = page.select_one('label[for={}]'.format(radios[index]['id']))
-        assert (
-            radios[index]['value'],
-            normalize_spaces(label.text),
-        ) == option
+        option_values = {
+            'value': radios[index]['value'],
+            'label': normalize_spaces(page.select_one('label[for={}]'.format(radios[index]['id'])).text)
+        }
+        if 'hint' in option:
+            option_values['hint'] = normalize_spaces(
+                page.select_one('label[for={}] + .govuk-hint'.format(radios[index]['id'])).text)
+        assert option_values == option
 
     if expected_selected:
         assert page.select_one('input[checked]')['value'] == expected_selected