diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 6c56745d6..3d48e68f6 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -20,16 +20,16 @@
         autocomplete: "name"
       %>
 
-      <%= roles = User::ROLES.map { |key, value| OpenStruct.new(id:key, name: key.humanize) }
-        f.govuk_collection_select :role, roles, :id, :name, label: { text: "Role" }
-      %>
-
       <%= f.govuk_email_field :email,
         label: { text: "Email address" },
         autocomplete: "email",
         value: @resource.email
       %>
 
+      <%= roles = User::ROLES.map { |key, value| OpenStruct.new(id:key, name: key.humanize) }
+        f.govuk_collection_radio_buttons :role, roles, :id, :name, legend: { text: "Role", size: "m" }
+      %>
+
       <%= f.govuk_submit "Continue" %>
     </div>
   </div>
diff --git a/spec/features/organisation_spec.rb b/spec/features/organisation_spec.rb
index 71bdf3587..4172a1ba4 100644
--- a/spec/features/organisation_spec.rb
+++ b/spec/features/organisation_spec.rb
@@ -38,7 +38,7 @@ RSpec.describe "User Features" do
         expect(page).to have_content("Invite user to submit CORE data")
         fill_in("user[name]", with: "New User")
         fill_in("user[email]", with: "new_user@example.com")
-        select("Data provider", from: "user[role]")
+        choose("user-role-data-provider-field")
         expect { click_button("Continue") }.to change { ActionMailer::Base.deliveries.count }.by(1)
         expect(page).to have_current_path("/organisations/#{org_id}/users")
         expect(User.last.role).to eq("data_provider")