diff --git a/app/controllers/organisations_controller.rb b/app/controllers/organisations_controller.rb
index 8468a3f9f..e05b600ca 100644
--- a/app/controllers/organisations_controller.rb
+++ b/app/controllers/organisations_controller.rb
@@ -17,7 +17,7 @@ class OrganisationsController < ApplicationController
   end
 
   def users
-    @pagy, @users = pagy(@organisation.users.where(active: true))
+    @pagy, @users = pagy(filtered_users)
     render "users/index"
   end
 
@@ -58,6 +58,15 @@ class OrganisationsController < ApplicationController
 
 private
 
+  def filtered_users
+    search_param = params["user-search-field"]
+    if search_param
+      User.where("name ILIKE ?", "%#{search_param}%").where(active: true)
+    else
+      User.all.where(active: true)
+    end
+  end
+
   def org_params
     params.require(:organisation).permit(:name, :address_line1, :address_line2, :postcode, :phone)
   end
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 74c671e39..dfb6c6929 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -8,7 +8,8 @@
   <%= govuk_button_link_to "Invite user", new_user_path, html: { method: :get } %>
 <% end %>
 
-<%= form_with model: @user, url: users_path(), method: "get", local: true do |f| %>
+<% path = current_user.support? ? users_path : users_organisation_path(current_user.organisation) %>
+<%= form_with model: @user, url: path, method: "get", local: true do |f| %>
 <div class="app-search govuk-!-margin-bottom-4">
   <div class="govuk-form-group app-search__form-group">
     <label class="govuk-label govuk-!-margin-bottom-2" for="user-search-field">
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 948121a76..76a992bc6 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -336,7 +336,7 @@ RSpec.describe UsersController, type: :request do
 
   context "when user is signed in as a data coordinator" do
     let(:user) { FactoryBot.create(:user, :data_coordinator) }
-    let(:other_user) { FactoryBot.create(:user, organisation: user.organisation) }
+    let!(:other_user) { FactoryBot.create(:user, organisation: user.organisation, name: "filter name") }
 
     describe "#index" do
       before do
@@ -352,6 +352,33 @@ RSpec.describe UsersController, type: :request do
       it "does not show the download csv link" do
         expect(page).not_to have_link("Download (CSV)", href: "/users.csv")
       end
+
+      it "shows a search bar" do
+        follow_redirect!
+        expect(page).to have_field("user-search-field", type: "search")
+      end
+
+      context "when a search parameter is passed" do
+        before do
+          get "/organisations/#{user.organisation.id}/users?user-search-field=#{search_param}"
+        end
+
+        context "when our search string matches case" do
+          let (:search_param){"filter"}
+          it "returns only matching results" do
+            expect(page).not_to have_content(user.name)
+            expect(page).to have_content(other_user.name)
+          end
+        end
+
+        context "when we need case insensitive search" do
+          let (:search_param){"Filter"}
+          it "returns only matching results" do
+            expect(page).not_to have_content(user.name)
+            expect(page).to have_content(other_user.name)
+          end
+        end
+      end
     end
 
     describe "CSV download" do
@@ -613,7 +640,7 @@ RSpec.describe UsersController, type: :request do
 
             it "does update other values" do
               expect { patch "/users/#{other_user.id}", headers:, params: }
-                .to change { other_user.reload.name }.from("Danny Rojas").to("new name")
+                .to change { other_user.reload.name }.from("filter name").to("new name")
             end
           end
         end