diff --git a/app/templates/views/organisations/organisation/settings/index.html b/app/templates/views/organisations/organisation/settings/index.html
index de53a41a0..a24dcc896 100644
--- a/app/templates/views/organisations/organisation/settings/index.html
+++ b/app/templates/views/organisations/organisation/settings/index.html
@@ -19,7 +19,8 @@
         {{ text_field(current_org.name) }}
         {{ edit_field(
             'Change',
-            url_for('.edit_organisation_name', org_id=current_org.id)
+            url_for('.edit_organisation_name', org_id=current_org.id),
+            suffix='organisation name'
           )
         }}
       {% endcall %}
@@ -28,7 +29,8 @@
         {{ optional_text_field(current_org.organisation_type_label) }}
         {{ edit_field(
             'Change',
-            url_for('.edit_organisation_type', org_id=current_org.id)
+            url_for('.edit_organisation_type', org_id=current_org.id),
+            suffix='sector for the organisation'
           )
         }}
       {% endcall %}
@@ -43,7 +45,8 @@
         ) }}
         {{ edit_field(
             'Change',
-            url_for('.edit_organisation_crown_status', org_id=current_org.id)
+            url_for('.edit_organisation_crown_status', org_id=current_org.id),
+            suffix='organisation crown status'
           )
         }}
       {% endcall %}
@@ -58,7 +61,8 @@
         ) }}
         {{ edit_field(
             'Change',
-            url_for('.edit_organisation_agreement', org_id=current_org.id)
+            url_for('.edit_organisation_agreement', org_id=current_org.id),
+            suffix='data sharing and financial agreement for the organisation'
           )
         }}
       {% endcall %}
@@ -67,7 +71,8 @@
         {{ optional_text_field(current_org.request_to_go_live_notes, default='None') }}
         {{ edit_field(
             'Change',
-            url_for('.edit_organisation_go_live_notes', org_id=current_org.id)
+            url_for('.edit_organisation_go_live_notes', org_id=current_org.id),
+            suffix='go live notes for the organisation'
           )
         }}
       {% endcall %}
@@ -75,13 +80,23 @@
       {% call row() %}
         {{ text_field('Billing details')}}
         {{ optional_text_field(current_org.billing_details, default="No billing details yet", wrap=True) }}
-        {{ edit_field('Change', url_for('.edit_organisation_billing_details', org_id=current_org.id), suffix='billing details for the organisation') }}
+        {{ edit_field(
+            'Change',
+            url_for('.edit_organisation_billing_details', org_id=current_org.id),
+            suffix='billing details for the organisation'
+          )
+        }}
       {% endcall %}
 
       {% call row() %}
         {{ text_field('Notes')}}
         {{ optional_text_field(current_org.notes, default="No notes yet", wrap=True) }}
-        {{ edit_field('Change', url_for('.edit_organisation_notes', org_id=current_org.id), suffix='the notes for the organisation') }}
+        {{ edit_field(
+            'Change',
+            url_for('.edit_organisation_notes', org_id=current_org.id),
+            suffix='the notes for the organisation'
+          )
+        }}
       {% endcall %}
 
       {% call row() %}
@@ -89,7 +104,8 @@
         {{ text_field(current_org.email_branding_name) }}
         {{ edit_field(
             'Change',
-            url_for('.edit_organisation_email_branding', org_id=current_org.id)
+            url_for('.edit_organisation_email_branding', org_id=current_org.id),
+            suffix='default email branding for the organisation'
           )
         }}
       {% endcall %}
@@ -101,7 +117,8 @@
         ) }}
         {{ edit_field(
             'Change',
-            url_for('.edit_organisation_letter_branding', org_id=current_org.id)
+            url_for('.edit_organisation_letter_branding', org_id=current_org.id),
+            suffix='default letter branding for the organisation'
           )
         }}
       {% endcall %}
@@ -110,7 +127,8 @@
         {{ optional_text_field(current_org.domains or None, default='None') }}
         {{ edit_field(
             'Change',
-            url_for('.edit_organisation_domains', org_id=current_org.id)
+            url_for('.edit_organisation_domains', org_id=current_org.id),
+            suffix='known email domains for the organisation'
           )
         }}
       {% endcall %}
diff --git a/tests/app/main/views/organisations/test_organisations.py b/tests/app/main/views/organisations/test_organisations.py
index 038966584..78a2562ce 100644
--- a/tests/app/main/views/organisations/test_organisations.py
+++ b/tests/app/main/views/organisations/test_organisations.py
@@ -686,16 +686,19 @@ def test_organisation_settings_for_platform_admin(
 ):
     expected_rows = [
         'Label Value Action',
-        'Name Test organisation Change',
-        'Sector Central government Change',
-        'Crown organisation Yes Change',
-        'Data sharing and financial agreement Not signed Change',
-        'Request to go live notes None Change',
+        'Name Test organisation Change organisation name',
+        'Sector Central government Change sector for the organisation',
+        'Crown organisation Yes Change organisation crown status',
+        (
+            'Data sharing and financial agreement '
+            'Not signed Change data sharing and financial agreement for the organisation'
+        ),
+        'Request to go live notes None Change go live notes for the organisation',
         'Billing details No billing details yet Change billing details for the organisation',
         'Notes No notes yet Change the notes for the organisation',
-        'Default email branding GOV.UK Change',
-        'Default letter branding No branding Change',
-        'Known email domains None Change',
+        'Default email branding GOV.UK Change default email branding for the organisation',
+        'Default letter branding No branding Change default letter branding for the organisation',
+        'Known email domains None Change known email domains for the organisation',
     ]
 
     client_request.login(platform_admin_user)