diff --git a/app/main/forms.py b/app/main/forms.py
index fbe29e759..177e8ac0d 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -1061,7 +1061,7 @@ class AddGPOrganisationForm(StripWhitespaceForm):
         ),
     )
 
-    name = StringField(
+    name = GovukTextInputField(
         'What’s your practice called?',
     )
 
diff --git a/app/templates/views/organisations/add-gp-organisation.html b/app/templates/views/organisations/add-gp-organisation.html
index 91d923f79..36beab43e 100644
--- a/app/templates/views/organisations/add-gp-organisation.html
+++ b/app/templates/views/organisations/add-gp-organisation.html
@@ -22,7 +22,7 @@
       {% endfor %}
     {% endcall %}
     {% call conditional_radio_panel('custom-organisation-name') %}
-      {{ textbox(form.name) }}
+      {{ form.name }}
     {% endcall %}
     {{ page_footer('Continue') }}
   {% endcall %}
diff --git a/tests/app/main/views/organisations/test_organisation.py b/tests/app/main/views/organisations/test_organisation.py
index 99f4efe40..d0892f96e 100644
--- a/tests/app/main/views/organisations/test_organisation.py
+++ b/tests/app/main/views/organisations/test_organisation.py
@@ -358,7 +358,7 @@ def test_validation_of_gps_creating_organisations(
         _data=data,
         _expected_status=200,
     )
-    assert normalize_spaces(page.select_one('.error-message').text) == expected_error
+    assert expected_error in page.select_one('.govuk-error-message, .error-message').text
 
 
 def test_nhs_local_assigns_to_selected_organisation(