diff --git a/staff/views/users.py b/staff/views/users.py
index 70d701330..a9aa99931 100644
--- a/staff/views/users.py
+++ b/staff/views/users.py
@@ -41,7 +41,7 @@ def post(self, request, *args, **kwargs):
 @method_decorator(require_permission("user_manage"), name="dispatch")
 class UserCreate(FormView):
     form_class = UserCreateForm
-    template_name = "staff/user_create.html"
+    template_name = "staff/user/create.html"
 
     def get_initial(self):
         initial = {}
@@ -95,7 +95,7 @@ class UserDetailWithEmail(UpdateView):
     model = User
     slug_field = "username"
     slug_url_kwarg = "username"
-    template_name = "staff/user_detail_with_email.html"
+    template_name = "staff/user/detail_with_email.html"
 
     def get_context_data(self, **kwargs):
         orgs = [
@@ -131,7 +131,7 @@ class UserDetailWithOAuth(UpdateView):
     model = User
     slug_field = "username"
     slug_url_kwarg = "username"
-    template_name = "staff/user_detail_with_oauth.html"
+    template_name = "staff/user/detail_with_oauth.html"
 
     @transaction.atomic()
     def form_valid(self, form):
@@ -152,24 +152,9 @@ def get_context_data(self, **kwargs):
         jobs = Job.objects.filter(job_request__created_by=self.object).order_by(
             "-created_at"
         )
-        orgs = [
-            {
-                "name": m.org.name,
-                "roles": sorted(r.display_name for r in m.roles),
-                "staff_url": m.org.get_staff_url(),
-            }
-            for m in self.object.org_memberships.order_by("org__name")
-        ]
-        projects = [
-            {
-                "name": m.project.title,
-                "roles": sorted(r.display_name for r in m.roles),
-                "staff_url": m.project.get_staff_url(),
-            }
-            for m in self.object.project_memberships.order_by(
-                "project__number", Lower("project__name")
-            )
-        ]
+        orgs = self.object.orgs.order_by(Lower("name"))
+        projects = self.object.projects.order_by("number", Lower("name"))
+
         return super().get_context_data(**kwargs) | {
             "applications": applications,
             "copiloted_projects": copiloted_projects,
@@ -199,7 +184,8 @@ def get_initial(self):
 @method_decorator(require_permission("user_manage"), name="dispatch")
 class UserList(ListView):
     model = User
-    template_name = "staff/user_list.html"
+    paginate_by = 25
+    template_name = "staff/user/list.html"
 
     def get_context_data(self, **kwargs):
         all_roles = [name for name, value in inspect.getmembers(roles, inspect.isclass)]
@@ -229,7 +215,7 @@ def get_queryset(self):
             is_github_user=Exists(social_auths),
             org_exists=Exists(orgs),
             project_exists=Exists(projects),
-        ).order_by(Lower("username"))
+        ).order_by_name()
 
         # filter on the search query
         if q := self.request.GET.get("q"):
@@ -262,7 +248,7 @@ def get_queryset(self):
 @method_decorator(require_permission("user_manage"), name="dispatch")
 class UserRoleList(FormView):
     form_class = RolesForm
-    template_name = "staff/user_role_list.html"
+    template_name = "staff/user/role_list.html"
 
     def dispatch(self, request, *args, **kwargs):
         self.user = get_object_or_404(User, username=self.kwargs["username"])
@@ -300,7 +286,7 @@ def get_initial(self):
 @method_decorator(require_permission("user_manage"), name="dispatch")
 class UserSetOrgs(FormView):
     form_class = UserOrgsForm
-    template_name = "staff/user_set_orgs.html"
+    template_name = "staff/user/set_orgs.html"
 
     def dispatch(self, request, *args, **kwargs):
         self.user = get_object_or_404(User, username=self.kwargs["username"])
diff --git a/templates/_components/card/card.html b/templates/_components/card/card.html
index 81a071947..6350a290f 100644
--- a/templates/_components/card/card.html
+++ b/templates/_components/card/card.html
@@ -1,7 +1,7 @@
 <section {% attrs class id %} {% if title %}aria-labelledby="{{ title | slugify }}-title"{% endif %}>
   <div class="bg-white shadow">
     {% if title or subtitle or button %}
-    <div class="flex flex-wrap gap-2 items-center justify-between px-4 py-2 sm:px-6 sm:py-4 sm:flex-nowrap {{ header_class }}">
+    <div class="flex flex-wrap gap-2 items-center justify-between px-4 py-2 sm:px-6 sm:py-4 {{ header_class }}">
       <div>
         {% if title %}
         <h2 id="{{ title | slugify }}-title" class="text-xl font-semibold tracking-tight text-slate-900">
diff --git a/templates/staff/project_create.htmx.html b/templates/staff/project_create.htmx.html
index 772737f46..35383a462 100644
--- a/templates/staff/project_create.htmx.html
+++ b/templates/staff/project_create.htmx.html
@@ -1,16 +1,26 @@
-<div id="modal" class="modal fade" tabindex="-1">
-  <div class="modal-dialog modal-dialog-centered" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title">Create a project</h5>
-        <button type="button" class="close" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
+{% #card container=True title="Create an organisation" %}
+  <form method="POST" hx-post="{{ post_url }}">
+    {% csrf_token %}
 
-      <div class="modal-body">
-        {% include "staff/project_create.form.html" %}
-      </div>
+    {% if form.non_field_errors %}
+      {% for error in form.non_field_errors %}
+        {% #alert variant="danger" class="mb-6" %}
+          {{ error }}
+        {% /alert %}
+      {% endfor %}
+    {% endif %}
+
+    <div class="flex flex-col items-stretch gap-y-6 w-full max-w-3xl mb-6">
+      {% form_select field=form.fields.org choices=form.fields.org.choices selected=form.org.value id="id_org" name="org" label="Select an org" %}
+      {% form_select field=form.fields.copilot choices=form.fields.copilot.choices selected=form.copilot.value id="id_copilot" name="copilot" label="Select a user to co-pilot this project" %}
+      {% form_input field=form.name label="Project name"%}
+      {% form_input field=form.application_url label="Application URL" %}
+      {% form_input field=form.number label="Project number" %}
+    </div>
+
+    <div class="flex flex-row flex-wrap gap-2">
+      {% #button variant="success" type="submit" %}Add project{% /button %}
+      {% #button variant="danger" id="closeModal" %}Cancel{% /button %}
     </div>
-  </div>
-</div>
+  </form>
+{% /card %}
diff --git a/templates/staff/user/create.html b/templates/staff/user/create.html
new file mode 100644
index 000000000..8897c959d
--- /dev/null
+++ b/templates/staff/user/create.html
@@ -0,0 +1,81 @@
+{% extends "staff/base-tw.html" %}
+
+{% load static %}
+
+{% block extra_styles %}
+<link rel="stylesheet" href="{% static 'vendor/select2.min.css' %}">
+<link rel="stylesheet" href="{% static 'vendor/select2-bootstrap4.min.css' %}">
+{% endblock %}
+
+{% block metatitle %}Staff Area: Create an interactive user | OpenSAFELY Jobs{% endblock metatitle %}
+
+{% block breadcrumbs %}
+{% #breadcrumbs %}
+  {% url "staff:index" as staff_url %}
+  {% url "staff:user-list" as staff_user_list_url %}
+  {% breadcrumb title="Staff area" url=staff_url %}
+  {% breadcrumb title="Users" url=staff_user_list_url %}
+  {% breadcrumb title="Create an interactive user" active=True %}
+{% /breadcrumbs %}
+{% endblock breadcrumbs %}
+
+{% block hero %}
+{% #staff_hero title="Create an interactive user" %}
+<p>
+  Creating a user here will set up an account for a user who can only use
+  the Interactive portion of the site.  They will be emailed with a link
+  to set their password.  Please ensure users are part of an
+  <strong>approved application</strong>.
+</p>
+{% /staff_hero %}
+{% endblock hero %}
+
+{% block content %}
+<form method="POST">
+  {% csrf_token %}
+
+  {% #card title="User details" class="max-w-3xl" container=True %}
+    {% if form.non_field_errors %}
+      {% for error in form.non_field_errors %}
+        {% #alert variant="danger" class="mb-6" %}
+          {{ error }}
+        {% /alert %}
+      {% endfor %}
+    {% endif %}
+
+    <div class="flex flex-col items-stretch gap-y-6 w-full max-w-3xl mb-6">
+      {% fragment as select_hint_text %}
+        If the project doesn't exist, you can
+        {% url "staff:project-create" as staff_project_create_url %}
+        {% var new_project_url=staff_project_create_url|add:"?next="|add:request.path %}
+        {% link href=new_project_url text="add a new project" append_after="." hx-get=new_project_url hx-target="dialog#addNewProject" hx-trigger="click" %}
+      {% endfragment %}
+      {% form_select field=form.fields.project choices=form.fields.project.choices selected=form.project.value id="id_project" name="project" label="Select a project" hint_text=select_hint_text %}
+      {% form_input field=form.name label="Name" %}
+      {% form_input field=form.email label="Email address" inputmode="email" %}
+    </div>
+
+    {% #button variant="success" type="submit" %}
+      Create
+    {% /button %}
+  {% /card %}
+</form>
+<dialog class="max-w-lg w-full" id="addNewProject"></dialog>
+{% endblock content %}
+
+{% block extra_js %}
+<script type="text/javascript" src="{% static 'vendor/htmx.min.js' %}"></script>
+<script nonce="{{ request.csp_nonce }}">
+  htmx.on("htmx:afterSwap", (e) => {
+    const modal = e.target;
+    modal.showModal();
+
+    const closeModalBtn = document.getElementById("closeModal");
+    if (closeModalBtn) {
+      closeModalBtn.addEventListener("click", () => {
+        closeModalBtn.closest("dialog").close();
+      });
+    }
+  });
+</script>
+{% endblock %}
diff --git a/templates/staff/user/detail_with_email.html b/templates/staff/user/detail_with_email.html
new file mode 100644
index 000000000..3ff3decba
--- /dev/null
+++ b/templates/staff/user/detail_with_email.html
@@ -0,0 +1,72 @@
+{% extends "staff/base-tw.html" %}
+
+{% load humanize %}
+
+{% block metatitle %}Staff Area: {{ user.name }} | OpenSAFELY Jobs{% endblock metatitle %}
+
+{% block breadcrumbs %}
+  {% #breadcrumbs %}
+    {% url "staff:index" as staff_url %}
+    {% url "staff:user-list" as staff_user_list_url %}
+    {% breadcrumb title="Staff area" url=staff_url %}
+    {% breadcrumb title="Users" url=staff_user_list_url %}
+    {% breadcrumb title=user.username active=True %}
+  {% /breadcrumbs %}
+{% endblock breadcrumbs %}
+
+{% block hero %}
+  {% #staff_hero title="User: "|add:user.name %}
+    <div class="flex flex-row gap-2 mt-2">
+      {% #button type="link" href=user.get_staff_roles_url variant="danger" %}
+        Edit roles
+      {% /button %}
+    </div>
+  {% /staff_hero %}
+{% endblock hero %}
+
+{% block content %}
+<div class="flex flex-col gap-4">
+  <form method="POST" class="flex flex-col gap-4">
+    {% csrf_token %}
+
+    {% if form.non_field_errors %}
+      {% for error in form.non_field_errors %}
+        {% #alert variant="danger" class="mb-6" %}
+          {{ error }}
+        {% /alert %}
+      {% endfor %}
+    {% endif %}
+
+    {% #card title="User details" container=True container_class="flex flex-col items-start gap-4" %}
+      {% form_input field=form.fullname label="Full name" class="max-w-prose w-full" %}
+      {% form_input field=form.email label="Email" class="max-w-prose w-full" %}
+      {% #button type="submit" variant="success" %}Update details{% /button %}
+    {% /card %}
+  </form>
+
+  {% url "staff:user-set-orgs" username=user.username as staff_user_set_orgs_url %}
+  {% #card title="Organisations" button=True button_text="Add to organisation" button_href=staff_user_set_orgs_url %}
+    {% #list_group %}
+      {% for org in orgs %}
+        {% #list_group_item href=org.get_staff_url %}
+          {{ org.name }}
+        {% /list_group_item %}
+      {% empty %}
+        {% list_group_empty icon=True title="No organisations" description="This user is not a member of any organisations" %}
+      {% endfor %}
+    {% /list_group %}
+  {% /card %}
+
+  {% #card title="Projects" %}
+    {% #list_group %}
+      {% for project in projects %}
+        {% #list_group_item href=project.get_staff_url %}
+          {{ project.name }}
+        {% /list_group_item %}
+      {% empty %}
+        {% list_group_empty icon=True title="No projects" description="This user is not a member of any projects" %}
+      {% endfor %}
+    {% /list_group %}
+  {% /card %}
+</div>
+{% endblock content %}
diff --git a/templates/staff/user/detail_with_oauth.html b/templates/staff/user/detail_with_oauth.html
new file mode 100644
index 000000000..9a0e9138e
--- /dev/null
+++ b/templates/staff/user/detail_with_oauth.html
@@ -0,0 +1,197 @@
+{% extends "staff/base-tw.html" %}
+
+{% load humanize %}
+{% load static %}
+
+{% block metatitle %}Staff Area: {{ user.name }} | OpenSAFELY Jobs{% endblock metatitle %}
+
+{% block breadcrumbs %}
+  {% #breadcrumbs %}
+    {% url "staff:index" as staff_url %}
+    {% url "staff:user-list" as staff_user_list_url %}
+    {% breadcrumb title="Staff area" url=staff_url %}
+    {% breadcrumb title="Users" url=staff_user_list_url %}
+    {% breadcrumb title=user.username active=True %}
+  {% /breadcrumbs %}
+{% endblock breadcrumbs %}
+
+{% block hero %}
+  {% #staff_hero title="User: "|add:user.name %}
+    <div class="flex flex-row gap-2 mt-2">
+      {% #button type="link" href=user.get_staff_roles_url variant="danger" %}
+        Edit roles
+      {% /button %}
+      {% #button type="link" href=user.get_absolute_url variant="primary" %}
+        View on Site
+      {% /button %}
+    </div>
+  {% /staff_hero %}
+{% endblock hero %}
+
+{% block content %}
+  <div class="flex flex-col gap-4">
+    {% if not orgs or not user.backends.exists %}
+      {% #alert variant="warning" title="No projects" %}
+        <p>
+          A user <strong>requires</strong> access to certain resources to be able to use the Jobs site. The following are missing for this user:
+        </p>
+        <ul class="list-disc ml-4 mt-2">
+          {% if not user.backends.exists %}
+            <li>Backends</li>
+          {% endif %}
+          {% if not orgs %}
+            <li>Orgs</li>
+          {% endif %}
+        </ul>
+      {% /alert %}
+    {% endif %}
+
+    {% if not projects %}
+      {% #alert variant="warning" title="No projects" %}
+        A user would ideally have access to one or more Projects.
+      {% /alert %}
+    {% endif %}
+
+    {% #card title="User information" %}
+      {% #description_list %}
+        {% #description_item title="Username" %}
+          {{ user.username }}
+        {% /description_item %}
+
+        {% #description_item title="Email address" %}
+          {{ user.email }}
+        {% /description_item %}
+
+        {% #description_item title="Joined" %}
+          {% #time datetime=user.date_joined|date:"Y-m-d H:i:sO" %}
+            {{ user.date_joined|date:"d F Y" }} at {{ user.date_joined|date:"H:i" }}
+          {% /time %}
+        {% /description_item %}
+      {% /description_list %}
+    {% /card %}
+
+    <form method="POST" class="flex flex-col gap-4">
+      {% csrf_token %}
+
+      {% if form.non_field_errors %}
+        {% for error in form.non_field_errors %}
+          {% #alert variant="danger" class="mb-6" %}
+            {{ error }}
+          {% /alert %}
+        {% endfor %}
+      {% endif %}
+
+      {% #card title="Name" subtitle="Update the name shown for this user across OpenSAFELY Jobs" container=True container_class="flex flex-col items-start gap-4" %}
+        {% form_input field=form.fullname label="Full name" class="max-w-prose w-full" %}
+        {% #button type="submit" variant="success" %}Update name{% /button %}
+      {% /card %}
+
+      {% #card title="Backends" container=True %}
+        {% #form_fieldset %}
+          {% if form.backends.errors %}
+            {% for error in form.backends.errors %}
+              {% #alert variant="danger" class="mb-6" %}
+                {{ error }}
+              {% /alert %}
+            {% endfor %}
+          {% endif %}
+
+          {% form_legend text="Select the backends this user has access to" %}
+
+          {% for value, label in form.backends.field.choices %}
+            {% with id=forloop.counter0|stringformat:"s" %}
+              {% if value in form.backends.value %}
+                {% var checked=True %}
+              {% else %}
+                {% var checked=False %}
+              {% endif %}
+              {% form_checkbox custom_field=True name="backends" id="id_backends_"|add:label|add:"_"|add:id|slugify label=label value=value checked=checked %}
+            {% endwith %}
+          {% endfor %}
+
+          {% #button type="submit" variant="success" class="mt-4" %}
+            Update backends
+          {% /button %}
+        {% /form_fieldset %}
+      {% /card %}
+    </form>
+
+    {% url "staff:user-set-orgs" username=user.username as staff_user_set_orgs_url %}
+    {% #card title="Organisations" button=True button_text="Add to organisation" button_href=staff_user_set_orgs_url %}
+      {% #list_group %}
+        {% for org in orgs %}
+          {% #list_group_item href=org.get_staff_url %}
+            {{ org.name }}
+          {% /list_group_item %}
+        {% empty %}
+          {% list_group_empty icon=True title="No organisations" description="This user is not a member of any organisations" %}
+        {% endfor %}
+      {% /list_group %}
+    {% /card %}
+
+    {% #card title="Projects" %}
+      {% #list_group %}
+        {% for project in projects %}
+          {% #list_group_item href=project.get_staff_url %}
+            {{ project.name }}
+          {% /list_group_item %}
+        {% empty %}
+          {% list_group_empty icon=True title="No projects" description="This user is not a member of any projects" %}
+        {% endfor %}
+      {% /list_group %}
+    {% /card %}
+
+    {% #card title="Applications" %}
+      {% #list_group %}
+        {% for application in applications %}
+          {% fragment as item_title %}
+            Application {{ application.pk_hash }}
+            {% if application.studyinformationpage.study_name %}
+              ({{ application.studyinformationpage.study_name }})
+            {% endif %}
+          {% endfragment %}
+          {% #list_group_rich_item status_text=application.status title=item_title type="Application" url=application.get_staff_url %}
+            <ul class="text-sm">
+              <li>Started on {{ application.created_at|date:"d F Y" }}</li>
+            </ul>
+          {% /list_group_rich_item %}
+        {% empty %}
+          {% list_group_empty icon=True title="No applications" description="This user has not created any applications" %}
+        {% endfor %}
+      {% /list_group %}
+    {% /card %}
+
+    {% #card title="Co-piloted Projects" %}
+      {% #list_group %}
+        {% for project in copiloted_projects %}
+          {% #list_group_item href=project.get_staff_url %}
+            {{ project.name }}
+          {% /list_group_item %}
+        {% empty %}
+          {% list_group_empty icon=True title="No co-piloted projects" description="This user has not co-piloted any projects" %}
+        {% endfor %}
+      {% /list_group %}
+    {% /card %}
+
+    {% if job_count %}
+      {% fragment as staff_user_job_requests_button_url %}
+        {% url 'staff:job-request-list' %}?user={{ user.username }}
+      {% endfragment %}
+      {% #card title="Jobs" subtitle="Most recent jobs run by this user" button=True button_text="View all" button_href=staff_user_job_requests_button_url %}
+        {% #list_group %}
+          {% for job in jobs %}
+            {% #list_group_rich_item status_text=job.status title=job.action type="Job" url=job.get_absolute_url %}
+              Created: {{ job.created_at|date:"d F Y" }}
+            {% /list_group_rich_item %}
+          {% endfor %}
+        {% /list_group %}
+      {% /card %}
+    {% else %}
+      {% #card title="Jobs" %}
+        {% #list_group %}
+          {% list_group_empty icon=True title="No jobs" description="This user has not submitted any jobs" %}
+        {% /list_group %}
+      {% /card %}
+    {% endif %}
+  </div>
+{% endblock content %}
diff --git a/templates/staff/user/list.html b/templates/staff/user/list.html
new file mode 100644
index 000000000..cd19b1228
--- /dev/null
+++ b/templates/staff/user/list.html
@@ -0,0 +1,139 @@
+{% extends "staff/base-tw.html" %}
+
+{% load django_vite %}
+{% load querystring_tools %}
+{% load selected_filter %}
+
+{% block metatitle %}Users: Staff Area | OpenSAFELY Jobs{% endblock metatitle %}
+
+{% block breadcrumbs %}
+{% #breadcrumbs %}
+  {% url "staff:index" as staff_url %}
+  {% breadcrumb title="Staff area" url=staff_url %}
+  {% breadcrumb title="Users" active=True %}
+{% /breadcrumbs %}
+{% endblock breadcrumbs %}
+
+{% block hero %}
+{% url "staff:user-create" as staff_user_create %}
+{% #staff_hero title="Users" %}
+  {% #button type="link" href=staff_user_create variant="primary" %}
+    Create an Interactive User
+  {% /button %}
+{% /staff_hero %}
+{% endblock hero %}
+
+{% block content %}
+{% url "staff:user-list" as staff_user_list_url %}
+<div class="grid lg:grid-cols-3 gap-8">
+  <form class="flex flex-col gap-y-6">
+    <div class="flex flex-row gap-2">
+      {% #button variant="success" type="submit" %}
+        Apply filters
+      {% /button %}
+      {% if request.GET %}
+        {% #button variant="secondary-outline" type="link" href=staff_user_list_url %}
+          Clear filters
+        {% /button %}
+      {% endif %}
+    </div>
+
+    {% #card title="Filter by backend" container=True %}
+      {% #multiselect custom_field=True name="backend" placeholder="Select a backend" %}
+        {% for backend in backends %}
+          {% is_filter_selected key="backend" value=backend.pk as is_backend_active %}
+          {% multiselect_option value=backend.pk name=backend.name is_active=is_backend_active %}
+        {% endfor %}
+      {% /multiselect %}
+    {% /card %}
+
+    {% #card title="Filter by missing link" container=True %}
+      {% #multiselect custom_field=True name="missing" placeholder="Select a missing link" %}
+        {% for missing_name in missing_names %}
+          {% is_filter_selected key="missing" value=missing_name as is_missing_active %}
+          {% multiselect_option value=missing_name name=missing_name|title is_active=is_missing_active %}
+        {% endfor %}
+      {% /multiselect %}
+    {% /card %}
+
+    {% #card title="Filter by organisation" container=True %}
+      {% #multiselect custom_field=True name="org" placeholder="Select an org" %}
+        {% for org in orgs %}
+          {% is_filter_selected key="org" value=org.slug as is_org_active %}
+          {% multiselect_option value=org.slug name=org.name is_active=is_org_active %}
+        {% endfor %}
+      {% /multiselect %}
+    {% /card %}
+
+    {% #card title="Filter by role" container=True %}
+      {% #multiselect custom_field=True name="role" placeholder="Select a role" %}
+        {% for role in roles %}
+          {% is_filter_selected key="role" value=role as is_role_active %}
+          {% multiselect_option value=role name=role is_active=is_role_active %}
+        {% endfor %}
+      {% /multiselect %}
+    {% /card %}
+  </form>
+
+  <div class="flex flex-col gap-y-6 lg:col-span-2">
+    {% #card container=True title="Search for a user" %}
+      <form method="GET" class="flex flex-row gap-x-2 items-center">
+        {% if request.GET.q %}
+          {% var value=request.GET.q|stringformat:"s" %}
+        {% endif %}
+        {% form_input custom_field=True type="search" id="userSearch" name="q" value=value label="Search for a user" label_class="sr-only" class="w-full" input_class="!m-0" placeholder="Search by user name" show_placeholder=True %}
+        {% #button type="submit" variant="primary" class="flex-shrink-0" %}Search{% /button %}
+      </form>
+      {% if request.GET.q %}
+        <p class="mt-3">
+          {% link href=staff_user_list_url text="Clear search" %}
+        </p>
+      {% endif %}
+    {% /card %}
+
+    {% #card %}
+      {% #list_group small=True %}
+        {% for user in object_list %}
+          {% #list_group_item class="flex flex-col gap-2" type="User" href=user.get_staff_url %}
+            <span>
+              {{ user.name }}
+            </span>
+
+            {% if user.is_github_user %}
+              {% if not user.backend_exists or not user.org_exists or not user.project_exists %}
+                <div class="flex flex-row flex-wrap gap-2">
+                  {% if not user.backend_exists %}
+                    {% pill variant="danger" text="Missing backends" %}
+                  {% endif %}
+                  {% if not user.org_exists %}
+                    {% pill variant="danger" text="Missing org" %}
+                  {% endif %}
+                  {% if not user.project_exists %}
+                    {% pill variant="warning" text="Missing projects" %}
+                  {% endif %}
+                </div>
+              {% endif %}
+            {% endif %}
+          {% /list_group_item %}
+        {% empty %}
+          {% list_group_empty icon=True title="No users found" description="Try a new search or clearing the filters" %}
+        {% endfor %}
+      {% /list_group %}
+
+      {% if page_obj.has_previous or page_obj.has_next %}
+        {% if page_obj.has_next %}
+          {% url_with_querystring page=page_obj.next_page_number as next_page_url %}
+        {% endif %}
+        {% if page_obj.has_previous %}
+          {% url_with_querystring page=page_obj.previous_page_number as previous_page_url %}
+        {% endif %}
+        {% card_pagination page_number=page_obj.number total_pages=page_obj.paginator.num_pages next_page_url=next_page_url previous_page_url=previous_page_url no_container=True %}
+      {% endif %}
+    {% /card %}
+  </div>
+</div>
+{% endblock content %}
+
+{% block extra_js %}
+  {% vite_asset "templates/_components/multiselect/multiselect.js" %}
+{% endblock extra_js %}
diff --git a/templates/staff/user/role_list.html b/templates/staff/user/role_list.html
new file mode 100644
index 000000000..a619ddd74
--- /dev/null
+++ b/templates/staff/user/role_list.html
@@ -0,0 +1,113 @@
+{% extends "staff/base-tw.html" %}
+
+{% load querystring_tools %}
+{% load roles %}
+{% load selected_filter %}
+
+{% block metatitle %}Users: Staff Area | OpenSAFELY Jobs{% endblock metatitle %}
+
+{% block breadcrumbs %}
+  {% #breadcrumbs %}
+    {% url "staff:index" as staff_url %}
+    {% url "staff:user-list" as staff_user_list_url %}
+    {% breadcrumb title="Staff area" url=staff_url %}
+    {% breadcrumb title="Users" url=staff_user_list_url %}
+    {% breadcrumb title=user.username url=user.get_staff_url %}
+    {% breadcrumb title="Edit roles" active=True %}
+  {% /breadcrumbs %}
+{% endblock breadcrumbs %}
+
+{% block hero %}
+{% #staff_hero title="Roles for "|add:user.username %}
+  <p>Below are the roles assigned to {{ user.username }}, grouped by the context in which they have been assigned.</p>
+  <form action="{{ user.get_staff_clear_roles_url }}" method="POST">
+    {% csrf_token %}
+    {% #button type="submit" variant="danger" %}Clear all roles{% /button %}
+  </form>
+{% /staff_hero %}
+{% endblock hero %}
+
+{% block content %}
+<div class="flex flex-col gap-y-6 max-w-3xl">
+  <form method="POST">
+    {% csrf_token %}
+
+    {% #card title="Roles" container=True %}
+      {% if form.non_field_errors %}
+        {% for error in form.non_field_errors %}
+          {% #alert variant="danger" class="mb-6" %}
+            {{ error }}
+          {% /alert %}
+        {% endfor %}
+      {% endif %}
+
+      <div class="flex flex-col items-stretch gap-y-6 w-full max-w-3xl mb-6">
+        {% #form_fieldset %}
+          {% if form.roles.errors %}
+            {% for error in form.roles.errors %}
+              {% #alert variant="danger" class="mb-6" %}
+                {{ error }}
+              {% /alert %}
+            {% endfor %}
+          {% endif %}
+
+          {% form_legend text="Set the users roles" %}
+
+          {% for value, label in form.roles.field.choices %}
+            {% with id=forloop.counter0|stringformat:"s" %}
+              {% fragment as rich_label %}
+                <span class="block">{{ label }}</span>
+                <span class="text-sm mt-0.5">{{ value|role_description|linebreaksbr }}</span>
+              {% endfragment %}
+              {% if value in form.roles.value %}
+                {% var checked=True %}
+              {% else %}
+                {% var checked=False %}
+              {% endif %}
+              {% form_checkbox custom_field=True name="roles" id="id_roles_"|add:label|add:"_"|add:id|slugify label=rich_label value=value checked=checked %}
+            {% endwith %}
+          {% endfor %}
+        {% /form_fieldset %}
+      </div>
+
+      {% #button variant="success" type="submit" %}
+        Update
+      {% /button %}
+    {% /card %}
+  </form>
+
+  {% #card title="Projects" %}
+    {% #list_group %}
+      {% for membership in projects %}
+        {% #list_group_item href=project.get_staff_url|add:"?next="|add:request.path %}
+          {{ membership.project.name }}
+          {% for role in membership.roles %}
+            <span class="block text-sm text-slate-700">
+              {{ role.display_name }}
+            </span>
+          {% endfor %}
+        {% /list_group_item %}
+      {% empty %}
+        {% list_group_empty icon=True title="No projects" description="No project memberships with roles" %}
+      {% endfor %}
+    {% /list_group %}
+  {% /card %}
+
+  {% #card title="Orgs" %}
+    {% #list_group %}
+      {% for membership in org %}
+        {% #list_group_item href=project.get_staff_url|add:"?next="|add:request.path %}
+          {{ membership.org.name }}
+          {% for role in membership.roles %}
+            <span class="block text-sm text-slate-700">
+              {{ role.display_name }}
+            </span>
+          {% endfor %}
+        {% /list_group_item %}
+      {% empty %}
+        {% list_group_empty icon=True title="No orgs" description="No organisation memberships with roles" %}
+      {% endfor %}
+    {% /list_group %}
+  {% /card %}
+</div>
+{% endblock content %}
diff --git a/templates/staff/user/set_orgs.html b/templates/staff/user/set_orgs.html
new file mode 100644
index 000000000..d6a3b58fe
--- /dev/null
+++ b/templates/staff/user/set_orgs.html
@@ -0,0 +1,55 @@
+{% extends "staff/base-tw.html" %}
+
+{% block metatitle %}{{ user.username }} organisation memberships: Staff Area | OpenSAFELY Jobs{% endblock metatitle %}
+
+{% block breadcrumbs %}
+  {% #breadcrumbs %}
+    {% url "staff:index" as staff_url %}
+    {% url "staff:user-list" as staff_user_list_url %}
+    {% breadcrumb title="Staff area" url=staff_url %}
+    {% breadcrumb title="Users" url=staff_user_list_url %}
+    {% breadcrumb title=user.username url=user.get_staff_url %}
+    {% breadcrumb title="Edit organisation membership" active=True %}
+  {% /breadcrumbs %}
+{% endblock breadcrumbs %}
+
+{% block hero %}
+  {% staff_hero title="Edit organisation membership" text="Set the list of Organisations "|add:user.username|add:" has access to." %}
+{% endblock hero %}
+
+{% block content %}
+<form method="POST">
+  {% csrf_token %}
+
+  {% #card title="Organisations" class="max-w-3xl" container=True %}
+    {% if form.non_field_errors %}
+      {% for error in form.non_field_errors %}
+        {% #alert variant="danger" class="mb-6" %}
+          {{ error }}
+        {% /alert %}
+      {% endfor %}
+    {% endif %}
+
+    <div class="flex flex-col items-stretch gap-y-6 w-full max-w-3xl mb-6">
+      {% #form_fieldset %}
+        {% form_legend text="Select the orgs this user has access to" %}
+
+        {% for value, label in form.orgs.field.choices %}
+          {% with id=forloop.counter0|stringformat:"s" %}
+            {% if value in form.orgs.value %}
+              {% var checked=True %}
+            {% else %}
+              {% var checked=False %}
+            {% endif %}
+            {% form_checkbox custom_field=True name="orgs" id="id_orgs_"|add:label|add:"_"|add:id|slugify label=label value=value checked=checked %}
+          {% endwith %}
+        {% endfor %}
+      {% /form_fieldset %}
+    </div>
+
+    {% #button variant="success" type="submit" %}
+      Update
+    {% /button %}
+  {% /card %}
+</form>
+{% endblock content %}
diff --git a/templates/staff/user_create.html b/templates/staff/user_create.html
deleted file mode 100644
index 5675f7891..000000000
--- a/templates/staff/user_create.html
+++ /dev/null
@@ -1,148 +0,0 @@
-{% extends "staff/base.html" %}
-
-{% load static %}
-
-{% block extra_styles %}
-<link rel="stylesheet" href="{% static 'vendor/select2.min.css' %}">
-<link rel="stylesheet" href="{% static 'vendor/select2-bootstrap4.min.css' %}">
-{% endblock %}
-
-{% block metatitle %}Create a user: Staff Area | OpenSAFELY Jobs{% endblock metatitle %}
-
-{% block breadcrumbs %}
-<nav class="breadcrumb-container breadcrumb--danger" aria-label="breadcrumb">
-  <div class="container">
-    <ol class="breadcrumb rounded-0 mb-0 px-0">
-      <li class="breadcrumb-item">
-        <a href="{% url 'staff:index' %}">Staff area</a>
-      </li>
-      <li class="breadcrumb-item">
-        <a href="{% url 'staff:user-list' %}">Users</a>
-      </li>
-      <li class="breadcrumb-item active" aria-current="page">
-        Create a user
-      </li>
-    </ol>
-  </div>
-</nav>
-{% endblock breadcrumbs %}
-
-{% block jumbotron %}
-<div class="jumbotron jumbotron-fluid jumbotron--danger pt-md-2">
-  <div class="container">
-    <h1 class="display-4">Create interactive user</h1>
-  </div>
-</div>
-{% endblock jumbotron %}
-
-{% block content %}
-<div class="container">
-  <div class="row">
-    <div class="col-lg-9 col-xl-8">
-      <h2 class="sr-only">Create a Project</h2>
-
-      <p>
-        Creating a user here will set up an account for a user who can only use
-        the Interactive portion of the site.  They will be emailed with a link
-        to set their password.  Please ensure users are part of an
-        <strong>approved application</strong>.
-      </p>
-
-      <form class="mt-3 pt-3" method="POST">
-        {% csrf_token %}
-
-        {% if form.non_field_errors %}
-          <ul>
-            {% for error in form.non_field_errors %}
-              <li class="text-danger">{{ error }}</li>
-            {% endfor %}
-          </ul>
-        {% endif %}
-
-        <fieldset class="mb-3">
-          <legend class="h3 mb-3">Set the user's details</legend>
-
-          <div class="form-group">
-            <label class="font-weight-bold" for="id_project">Select an project</label>
-            <select id="id_project" name="project" aria-describedby="projectHelpBlock" required>
-              {% for value, label in form.fields.project.choices %}
-                <option
-                  value="{{ value }}"
-                  {% if form.project.value == value %}selected{% endif %}
-                  >{{ label }}</option>
-              {% endfor %}
-            </select>
-            <p id="projectHelpBlock" class="form-text text-muted">
-              If the project doesn't exist, you can
-              <button
-                hx-get="{% url 'staff:project-create' %}"
-                hx-target="#dialog"
-                hx-trigger="click"
-                class="btn btn-link m-0 p-0 border-0 font-weight-bold align-baseline"
-                >
-                add a new project
-              </button>
-            </p>
-
-            {% for error in form.projects.errors %}
-              <p class="text-danger">{{ error }}</p>
-            {% endfor %}
-          </div>
-
-          {% include "components/form_text.html" with field=form.name label="Name" name="name" %}
-          {% include "components/form_text.html" with field=form.email label="Email address" name="email" %}
-        </fieldset>
-
-        <button class="btn btn-success" type="submit">Create</button>
-      </form>
-    </div>
-  </div>
-</div>
-
-<div id="dialog" class="modal-dialog" hx-target="this"></div>
-
-{% endblock content %}
-
-{% block extra_js %}
-<script type="text/javascript" src="{% static 'vendor/htmx.min.js' %}"></script>
-<script type="text/javascript" src="{% static 'vendor/select2.min.js' %}"></script>
-<script type="text/javascript" nonce="{{ request.csp_nonce }}">
-  $(document).ready(function() {
-    $('#id_org').select2({
-      placeholder: "Select an org for the user",
-      selectionCssClass: ":all:",
-      theme: "bootstrap4",
-      width: "100%"
-    });
-    $('#id_project').select2({
-      placeholder: "Select a project for the user",
-      selectionCssClass: ":all:",
-      theme: "bootstrap4",
-      width: "100%"
-    });
-  });
-</script>
-<script nonce="{{ request.csp_nonce }}">
-  (function () {
-    htmx.on("htmx:afterSwap", (e) => {
-      // Response targeting #dialog => show the modal
-      if (e.detail.target.id === "dialog") {
-        $("#modal").modal("show");
-      }
-    });
-
-    htmx.on("htmx:beforeSwap", (e) => {
-      // Empty response targeting #dialog => hide the modal
-      if (e.detail.target.id === "dialog" && !e.detail.xhr.response) {
-        $("#modal").modal("hide");
-        e.detail.shouldSwap = false;
-      }
-    });
-
-    // Remove dialog content after hiding
-    $("#modal").on("hidden.bs.modal", () => {
-      $("#dialog").empty();
-    });
-  })();
-</script>
-{% endblock %}
diff --git a/templates/staff/user_detail_with_email.html b/templates/staff/user_detail_with_email.html
deleted file mode 100644
index 610003785..000000000
--- a/templates/staff/user_detail_with_email.html
+++ /dev/null
@@ -1,107 +0,0 @@
-{% extends "staff/base.html" %}
-
-{% load humanize %}
-
-{% block metatitle %}{{ user.username }}: Staff Area | OpenSAFELY Jobs{% endblock metatitle %}
-
-{% block breadcrumbs %}
-<nav class="breadcrumb-container breadcrumb--danger" aria-label="breadcrumb">
-  <div class="container">
-    <ol class="breadcrumb rounded-0 mb-0 px-0">
-      <li class="breadcrumb-item">
-        <a href="{% url 'staff:index' %}">Staff area</a>
-      </li>
-      <li class="breadcrumb-item">
-        <a href="{% url 'staff:user-list' %}">Users</a>
-      </li>
-      <li class="breadcrumb-item active" aria-current="page">
-        {{ user.username }}
-      </li>
-    </ol>
-  </div>
-</nav>
-{% endblock breadcrumbs %}
-
-{% block jumbotron %}
-<div class="jumbotron jumbotron-fluid jumbotron--danger pt-md-2">
-  <div class="container">
-    <h1 class="display-4">{{ user.name }}</h1>
-
-    <ul class="list-unstyled lead">
-      <li>
-        <strong>Email:</strong>
-        {{ user.email }}
-      </li>
-
-      <li>
-        <strong>Created at:</strong> {{ user.date_joined }}
-      </li>
-    </ul>
-
-    <div class="d-flex">
-      <a class="btn btn-primary mr-1" href="{{ user.get_staff_roles_url }}">Roles</a>
-    </div>
-
-  </div>
-</div>
-{% endblock jumbotron %}
-
-{% block content %}
-<div class="container">
-  <div class="row">
-    <div class="col col-lg-9 col-xl-8">
-
-      <form method="POST">
-        {% csrf_token %}
-
-        {% if form.non_field_errors %}
-        <ul>
-          {% for error in form.non_field_errors %}
-          <li class="text-danger">{{ error }}</li>
-          {% endfor %}
-        </ul>
-        {% endif %}
-
-        <div class="mb-5">
-          {% include "components/form_text.html" with field=form.fullname label="Full name" name="fullname" %}
-          {% include "components/form_text.html" with field=form.email label="Email" name="email" %}
-        </div>
-
-        <div class="form-group mb-5">
-          <div class="d-flex justify-content-between align-items-center">
-            <h2 id="orgs" class="h4">Organisations</h2>
-            <a class="btn btn-sm btn-primary" href="{% url 'staff:user-set-orgs' username=user.username %}">
-              Add to organisation
-            </a>
-          </div>
-
-          <div class="list-group mb-3">
-            {% for org in orgs %}
-            <a class="list-group-item list-group-item-action d-flex" href="{{ org.staff_url }}">
-              {{ org.name }}
-            </a>
-            {% endfor %}
-          </div>
-        </div>
-
-        <div class="form-group mb-5">
-          <h2 id="projects" class="h4">Projects</h2>
-
-          <div class="list-group mb-3">
-            {% for project in projects %}
-            <a class="list-group-item list-group-item-action d-flex align-items-center" href="{{ project.staff_url }}">
-              {{ project.name }}
-            </a>
-            {% endfor %}
-          </div>
-        </div>
-
-        <div class="form-group">
-          <button class="btn btn-primary" type="submit">Save</button>
-        </div>
-
-      </form>
-
-  </div>
-</div>
-{% endblock content %}
diff --git a/templates/staff/user_detail_with_oauth.html b/templates/staff/user_detail_with_oauth.html
deleted file mode 100644
index b76aea436..000000000
--- a/templates/staff/user_detail_with_oauth.html
+++ /dev/null
@@ -1,269 +0,0 @@
-{% extends "staff/base.html" %}
-
-{% load humanize %}
-
-{% block metatitle %}{{ user.username }}: Staff Area | OpenSAFELY Jobs{% endblock metatitle %}
-
-{% block breadcrumbs %}
-<nav class="breadcrumb-container breadcrumb--danger" aria-label="breadcrumb">
-  <div class="container">
-    <ol class="breadcrumb rounded-0 mb-0 px-0">
-      <li class="breadcrumb-item">
-        <a href="{% url 'staff:index' %}">Staff area</a>
-      </li>
-      <li class="breadcrumb-item">
-        <a href="{% url 'staff:user-list' %}">Users</a>
-      </li>
-      <li class="breadcrumb-item active" aria-current="page">
-        {{ user.username }}
-      </li>
-    </ol>
-  </div>
-</nav>
-{% endblock breadcrumbs %}
-
-{% block jumbotron %}
-<div class="jumbotron jumbotron-fluid jumbotron--danger pt-md-2">
-  <div class="container">
-    <h1 class="display-4">{{ user.name }}</h1>
-
-    <ul class="list-unstyled lead">
-      <li>
-        <strong>Username:</strong> {{ user.username }}
-      </li>
-
-      <li>
-        <strong>Email:</strong>
-        {{ user.email }}
-      </li>
-
-      <li>
-        <strong>Created at:</strong> {{ user.date_joined }}
-      </li>
-    </ul>
-
-    <div class="d-flex">
-      <a class="btn btn-primary mr-1" href="{{ user.get_staff_roles_url }}">Roles</a>
-    </div>
-
-  </div>
-</div>
-{% endblock jumbotron %}
-
-{% block content %}
-<div class="container">
-  <div class="row">
-    <div class="col col-lg-9 col-xl-8">
-
-      {% if not orgs or not user.backends.exists %}
-      <div class="alert alert-danger" role="alert">
-        <p>
-          A user <strong>requires</strong> access to certain resources to be
-          able to use the Jobs site.  The following are missing for this user:
-        </p>
-        <ul>
-          {% if not user.backends.exists %}
-          <li><a href="#backends">Backends</a></li>
-          {% endif %}
-          {% if not orgs %}
-          <li><a href="#orgs">Orgs</a></li>
-          {% endif %}
-        </ul>
-      </div>
-      {% endif %}
-
-      {% if not projects %}
-      <div class="alert alert-warning" role="alert">
-        A user would ideally have access to one or more <a href="#projects">Projects</a>.
-      </div>
-      {% endif %}
-
-      <form method="POST">
-        {% csrf_token %}
-
-        {% if form.non_field_errors %}
-        <ul>
-          {% for error in form.non_field_errors %}
-          <li class="text-danger">{{ error }}</li>
-          {% endfor %}
-        </ul>
-        {% endif %}
-
-        {% include "components/form_text.html" with field=form.fullname label="Full name" name="fullname" %}
-
-        <div class="form-group">
-          <h2 id="backends" class="h4">Backends</h2>
-
-          <p>
-            A list of backends {{ user.username }} has access to.
-          </p>
-
-          <p>
-            Once you've
-            <a href="https://docs.google.com/spreadsheets/d/1rmFdaUz2BFedLL9cgVk-PDWINeLAeupR0TYoS8Btlh0/edit#gid=0&range=Q1">
-              confirmed the user has signed a DAA and their application has been approved
-            </a>,
-            grant them access to only the backends their study requires.
-          </p>
-
-          <ul class="list-group mb-5">
-            {% for value, label in form.backends.field.choices %}
-            <li class="list-group-item">
-              <div class="custom-control custom-checkbox">
-                <input
-                  type="checkbox"
-                  class="custom-control-input"
-                  id="id_backends_{{ forloop.counter0 }}"
-                  name="backends"
-                  value="{{ value }}"
-                  {% if value in form.backends.value %}
-                  checked
-                  {% endif %}
-                />
-                <label class="custom-control-label" for="id_backends_{{ forloop.counter0 }}">
-                  {{ label }}
-                </label>
-              </div>
-            </li>
-            {% endfor %}
-          </ul>
-
-          {% if form.backends.errors %}
-          <ul class="pl-3 mb-1">
-            {% for error in form.backends.errors %}
-            <li class="text-danger">{{ error }}</li>
-            {% endfor %}
-          </ul>
-          {% endif %}
-
-        </div>
-
-        <div class="form-group mb-5">
-          <div class="d-flex justify-content-between align-items-center">
-            <h2 id="orgs" class="h4">Organisations</h2>
-            <a class="btn btn-sm btn-primary" href="{% url 'staff:user-set-orgs' username=user.username %}">
-              Add to organisation
-            </a>
-          </div>
-
-          <div class="list-group mb-3">
-            {% for org in orgs %}
-            <a class="list-group-item list-group-item-action d-flex" href="{{ org.staff_url }}">
-              {{ org.name }}
-            </a>
-            {% endfor %}
-          </div>
-        </div>
-
-        <div class="form-group mb-5">
-          <h2 id="projects" class="h4">Projects</h2>
-
-          <div class="list-group mb-3">
-            {% for project in projects %}
-            <a class="list-group-item list-group-item-action d-flex align-items-center" href="{{ project.staff_url }}">
-              {{ project.name }}
-            </a>
-            {% endfor %}
-          </div>
-        </div>
-
-        <div class="form-group mb-3">
-          <h2 class="h4">Authored Applications</h2>
-
-          <div class="list-group mb-3">
-            {% for application in applications %}
-            <a class="list-group-item list-group-item-action" href="{{ application.get_staff_url }}">
-
-              <div>
-                Application {{ application.pk_hash }}
-                {% if application.studyinformationpage.study_name %}
-                ({{ application.studyinformationpage.study_name }})
-                {% endif %}
-              </div>
-
-              <div>
-                <small class="text-muted">Started on {{ application.created_at|date }}</small>
-              </div>
-
-              {% if application.completed_at %}
-              <div>
-                <small class="text-muted">Submitted on {{ application.completed_at|date }}</small>
-              </div>
-              {% endif %}
-
-            </a>
-            {% empty %}
-            <p class="list-group-item">No applications.</p>
-            {% endfor %}
-          </div>
-        </div>
-
-        <div class="form-group mb-5">
-          <h2 class="h4">Co-piloted Projects</h2>
-
-          <div class="list-group mb-3">
-            {% for project in copiloted_projects %}
-            <a class="list-group-item list-group-item-action" href="{{ project.get_staff_url }}">
-              {{ project.title }}
-            </a>
-            {% empty %}
-            <p class="list-group-item">No co-piloted projects.</p>
-            {% endfor %}
-          </div>
-        </div>
-
-        <div class="form-group">
-          <button class="btn btn-primary" type="submit">Save</button>
-        </div>
-
-      </form>
-
-      <div id="jobs" class="mt-5">
-
-        <div class="d-flex justify-content-between">
-          <h2 class="h4">Jobs</h2>
-          <div>
-            <a class="btn btn-sm btn-primary" href="{% url 'staff:job-request-list' %}?user={{ user.username }}">
-              View all ({{ job_count }})
-            </a>
-          </div>
-        </div>
-
-        <table class="table">
-          <thead>
-            <tr>
-              <th scope="col">Status</th>
-              <th scope="col">Job</th>
-              <th scope="col">Created</th>
-              <th scope="col">Runtime</th>
-            </tr>
-          </thead>
-          <tbody>
-            {% for job in jobs %}
-            <tr>
-              <td>
-                <div
-                  class="status status-icon {{ job.status }}"
-                  data-placement="bottom"
-                  data-toggle="tooltip"
-                  title="{{ job.status|capfirst }}"
-                >
-              </td>
-              <td><a href="{{ job.get_absolute_url }}">{{ job.identifier }}</a></td>
-              <td>
-                <time datetime="{{ job.created_at.isoformat }}">
-                  {{ job.created_at }}
-                </time>
-              </td>
-              <td>{{ job.runtime }}</td>
-            </tr>
-            {% endfor %}
-          </tbody>
-        </table>
-
-      </div>
-
-    </div>
-  </div>
-</div>
-{% endblock content %}
diff --git a/templates/staff/user_list.html b/templates/staff/user_list.html
deleted file mode 100644
index 3c45d4e46..000000000
--- a/templates/staff/user_list.html
+++ /dev/null
@@ -1,200 +0,0 @@
-{% extends "staff/base.html" %}
-
-{% load querystring_tools %}
-{% load selected_filter %}
-
-{% block metatitle %}Users: Staff Area | OpenSAFELY Jobs{% endblock metatitle %}
-
-{% block breadcrumbs %}
-<nav class="breadcrumb-container breadcrumb--danger" aria-label="breadcrumb">
-  <div class="container">
-    <ol class="breadcrumb rounded-0 mb-0 px-0">
-      <li class="breadcrumb-item">
-        <a href="{% url 'staff:index' %}">Staff area</a>
-      </li>
-      <li class="breadcrumb-item active" aria-current="page">
-        Users
-      </li>
-    </ol>
-  </div>
-</nav>
-{% endblock breadcrumbs %}
-
-{% block jumbotron %}
-<div class="jumbotron jumbotron-fluid jumbotron--danger pt-md-2">
-  <div class="container">
-    <h1 class="display-4">Users</h1>
-
-    <div class="d-flex">
-      <a class="btn btn-primary" href="{% url 'staff:user-create' %}">
-        Create Interactive User
-      </a>
-    </div>
-  </div>
-</div>
-{% endblock jumbotron %}
-
-{% block content %}
-<div class="container">
-  <div class="row">
-    <div class="col col-lg-3 col-xl-4">
-      <h2 class="h3">Filters</h2>
-
-      {% if request.GET %}
-      <div class="mb-3">
-        <a href="{% url 'staff:user-list' %}">Clear All</a>
-      </div>
-      {% endif %}
-
-      {% if request.GET.q %}
-      <div class="mb-3">
-        <h3 class="h4 mb-0">Search query</h3>
-        <code>{{ request.GET.q }}</code>
-      </div>
-      {% endif %}
-
-      {% if backends %}
-      <h3 class="h4">Backends</h3>
-      <div class="btn-group-vertical w-100 mb-4" role="group" aria-label="Filter by backends">
-        {% for backend in backends %}
-        {% is_filter_selected key="backend" value=backend.pk as is_active %}
-        <a
-          {% if is_active %}aria-pressed="true"{% endif %}
-          class="btn btn-outline-primary btn-block text-left {% if is_active %}active{% endif %}"
-          href="
-            {% if is_active %}
-              {% url_without_querystring backend=backend.pk %}
-            {% else %}
-              {% url_with_querystring backend=backend.pk %}
-            {% endif %}
-          "
-        >
-            {{ backend.name }}
-        </a>
-        {% endfor %}
-      </div>
-      {% endif %}
-
-      <h3 class="h4">Missing</h3>
-      <div class="btn-group-vertical w-100 mb-4" role="group" aria-label="Filter by missing links">
-        {% for missing_name in missing_names %}
-        {% is_filter_selected key="missing" value=missing_name as is_active %}
-        <a
-          {% if is_active %}aria-pressed="true"{% endif %}
-          class="btn btn-outline-primary btn-block text-left {% if is_active %}active{% endif %}"
-          href="
-            {% if is_active %}
-              {% url_without_querystring missing=missing_name %}
-            {% else %}
-              {% url_with_querystring missing=missing_name %}
-            {% endif %}
-          "
-        >
-            {{ missing_name|title }}
-        </a>
-        {% endfor %}
-      </div>
-
-      {% if roles %}
-      <h3 class="h4">Role</h3>
-      <div class="btn-group-vertical w-100 mb-4" role="group" aria-label="Filter by role">
-        {% for role in roles %}
-        {% is_filter_selected key="role" value=role as is_active %}
-        <a
-          {% if is_active %}aria-pressed="true"{% endif %}
-          class="btn btn-outline-primary btn-block text-left {% if is_active %}active{% endif %}"
-          href="
-            {% if is_active %}
-              {% url_without_querystring role=role %}
-            {% else %}
-              {% url_with_querystring role=role %}
-            {% endif %}
-          "
-        >
-            {{ role }}
-        </a>
-        {% endfor %}
-      </div>
-      {% endif %}
-
-      {% if orgs %}
-      <h3 class="h4">Orgs</h3>
-      <div class="btn-group-vertical w-100 mb-4" role="group" aria-label="Filter by orgs">
-        {% for org in orgs %}
-        {% is_filter_selected key="org" value=org.slug as is_active %}
-        <a
-          {% if is_active %}aria-pressed="true"{% endif %}
-          class="btn btn-outline-primary btn-block text-left {% if is_active %}active{% endif %}"
-          href="
-            {% if is_active %}
-              {% url_without_querystring org=org.slug %}
-            {% else %}
-              {% url_with_querystring org=org.slug %}
-            {% endif %}
-          "
-        >
-            {{ org.name }}
-        </a>
-        {% endfor %}
-      </div>
-      {% endif %}
-
-    </div>
-
-    <div class="col col-lg-9 col-xl-8">
-      <form class="form d-flex align-items-center mb-4" method="GET">
-      <input
-        class="form-control mr-2"
-        type="search"
-        placeholder="Search by name or username"
-        aria-label="Search"
-        {% if q %}
-        value="{{ q }}"
-        {% endif %}
-        name="q" />
-        <button class="btn btn-outline-primary my-2 my-sm-0" type="submit">Search</button>
-      </form>
-
-      <div class="list-group list-unstyled">
-        {% for user in object_list %}
-        <div class="d-flex justify-content-between align-items-center list-group-item list-group-item-action">
-
-          <a href="{{ user.get_staff_url }}" class="d-flex align-items-center">
-            {{ user.username }}
-            {% if user.get_full_name %}
-            <span class="text-muted ml-2 font-weight-normal">({{ user.get_full_name }})</span>
-            {% endif %}
-          </a>
-
-          <div>
-            {% if user.is_github_user %}
-
-            {% if not user.backend_exists %}
-            <span class="badge badge-danger" title="This user is missing a link to 1 or more Backends">
-              Backend
-            </span>
-            {% endif %}
-
-            {% if not user.org_exists %}
-            <span class="badge badge-danger" title="This user is missing a link to 1 or more Orgs">
-              Org
-            </span>
-            {% endif %}
-
-            {% if not user.project_exists %}
-            <span class="badge badge-warning"title="This user is missing a link to 1 or more Projects">
-              Project
-            </span>
-            {% endif %}
-
-            {% endif %}
-
-          </div>
-
-        </div>
-        {% endfor %}
-      </div>
-    </div>
-  </div>
-</div>
-{% endblock content %}
diff --git a/templates/staff/user_role_list.html b/templates/staff/user_role_list.html
deleted file mode 100644
index 5670b4daa..000000000
--- a/templates/staff/user_role_list.html
+++ /dev/null
@@ -1,134 +0,0 @@
-{% extends "staff/base.html" %}
-
-{% load querystring_tools %}
-{% load selected_filter %}
-
-{% block metatitle %}Users: Staff Area | OpenSAFELY Jobs{% endblock metatitle %}
-
-{% block breadcrumbs %}
-<nav class="breadcrumb-container breadcrumb--danger" aria-label="breadcrumb">
-  <div class="container">
-    <ol class="breadcrumb rounded-0 mb-0 px-0">
-      <li class="breadcrumb-item">
-        <a href="{% url 'staff:index' %}">Staff area</a>
-      </li>
-      <li class="breadcrumb-item">
-        <a href="{% url 'staff:user-list' %}">Users</a>
-      </li>
-      <li class="breadcrumb-item">
-        <a href="{{ user.get_staff_url }}">{{ user.username }}</a>
-      </li>
-      <li class="breadcrumb-item active" aria-current="page">
-        Roles
-      </li>
-    </ol>
-  </div>
-</nav>
-{% endblock breadcrumbs %}
-
-{% block jumbotron %}
-<div class="jumbotron jumbotron-fluid jumbotron--danger pt-md-2">
-  <div class="container">
-    <h1 class="display-4">Roles for {{ user.username }}</h1>
-    <p class="lead">
-      Below are the roles assigned to {{ user.username }}, grouped by the
-      context in which they have been assigned.
-    </p>
-
-    <div class="d-flex">
-      <form action="{{ user.get_staff_clear_roles_url }}" method="POST">
-        {% csrf_token %}
-        <button class="btn btn-danger mr-1" type="submit">Clear all roles</button>
-      </form>
-    </div>
-  </div>
-</div>
-{% endblock jumbotron %}
-
-{% block content %}
-<div class="container">
-  <div class="row">
-    <div class="col col-lg-9 col-xl-8">
-
-      <div class="mb-4">
-        <form method="POST">
-          {% csrf_token %}
-
-          {% if form.non_field_errors %}
-          <ul>
-            {% for error in form.non_field_errors %}
-            <li class="text-danger">{{ error }}</li>
-            {% endfor %}
-          </ul>
-          {% endif %}
-
-          {% include "components/form_roles.html" with field=form.roles label="Global roles" name="roles" %}
-
-          <div class="form-group">
-            <button class="btn btn-primary" type="submit">Save</button>
-          </div>
-
-        </form>
-      </div>
-
-      <hr class="mb-4" />
-
-      <div class="card mb-4">
-        <div class="card-header">
-          <h4>Orgs</h4>
-        </div>
-
-        <ul class="list-group list-group-flush">
-          {% for membership in org %}
-          <li class="list-group-item d-flex justify-content-between align-items-center">
-            <div>
-              {{ membership.org.name }}
-            </div>
-
-            <div>
-              {% for role in membership.roles %}
-              <span class="badge badge-pill badge-secondary">{{ role.display_name }}</span>
-              {% endfor %}
-            </div>
-          </li>
-          {% empty %}
-          <li class="list-group-item text-center">
-            No organisation memberships with roles
-          </li>
-          {% endfor %}
-        </ul>
-      </div>
-
-      <div class="card">
-        <div class="card-header">
-          <h4>Projects</h4>
-        </div>
-
-        <ul class="list-group list-group-flush">
-          {% for membership in projects %}
-          <li class="list-group-item d-flex justify-content-between align-items-center">
-            <div>
-              {{ membership.project.name }}
-            </div>
-
-            <div class="d-flex justify-content-between align-items-center">
-              <div class="mr-2">
-                {% for role in membership.roles %}
-                <span class="badge badge-pill badge-secondary">{{ role.display_name }}</span>
-                {% endfor %}
-              </div>
-              <a href="{{ membership.get_staff_edit_url }}?next={{ request.path }}" class="btn btn-sm btn-primary d-inline-block">Edit</a>
-            </div>
-          </li>
-          {% empty %}
-          <p class="list-group-item text-center">
-            No project memberships with roles
-          </p>
-          {% endfor %}
-        </ul>
-      </div>
-
-    </div>
-  </div>
-</div>
-{% endblock content %}
diff --git a/templates/staff/user_set_orgs.html b/templates/staff/user_set_orgs.html
deleted file mode 100644
index 3143d75a6..000000000
--- a/templates/staff/user_set_orgs.html
+++ /dev/null
@@ -1,92 +0,0 @@
-{% extends "staff/base.html" %}
-
-{% block metatitle %}{{ user.username }} organisation memberships: Staff Area | OpenSAFELY Jobs{% endblock metatitle %}
-
-{% block breadcrumbs %}
-<nav class="breadcrumb-container breadcrumb--danger" aria-label="breadcrumb">
-  <div class="container">
-    <ol class="breadcrumb rounded-0 mb-0 px-0">
-      <li class="breadcrumb-item">
-        <a href="{% url 'staff:index' %}">Staff area</a>
-      </li>
-      <li class="breadcrumb-item">
-        <a href="{% url 'staff:user-list' %}">Users</a>
-      </li>
-      <li class="breadcrumb-item">
-        <a href="{{ user.get_staff_url }}">{{ user.username }}</a>
-      </li>
-      <li class="breadcrumb-item active" aria-current="page">
-        Organisation memberships
-      </li>
-    </ol>
-  </div>
-</nav>
-{% endblock breadcrumbs %}
-
-{% block jumbotron %}
-<div class="jumbotron jumbotron-fluid jumbotron--danger pt-md-2">
-  <div class="container">
-    <h1 class="display-4">{{ user.username }}</h1>
-    <p class="lead">Set the list of Organisations {{ user.username }} has access to.</p>
-  </div>
-</div>
-{% endblock jumbotron %}
-
-{% block content %}
-<div class="container">
-  <div class="row">
-    <div class="col col-lg-9 col-xl-8">
-      <form method="POST">
-        {% csrf_token %}
-
-        {% if form.non_field_errors %}
-        <ul>
-          {% for error in form.non_field_errors %}
-          <li class="text-danger">{{ error }}</li>
-          {% endfor %}
-        </ul>
-        {% endif %}
-
-        <div class="form-group">
-          <ul class="list-group mb-5">
-            {% for value, label in form.orgs.field.choices %}
-            <li class="list-group-item">
-              <div class="custom-control custom-checkbox">
-                <input
-                  type="checkbox"
-                  class="custom-control-input"
-                  id="id_orgs_{{ forloop.counter0 }}"
-                  name="orgs"
-                  value="{{ value }}"
-                  {% if value in form.orgs.value %}
-                  checked
-                  {% endif %}
-                />
-                <label class="custom-control-label" for="id_orgs_{{ forloop.counter0 }}">
-                  {{ label }}
-                </label>
-              </div>
-            </li>
-            {% endfor %}
-          </ul>
-
-          {% if form.orgs.errors %}
-          <ul class="pl-3 mb-1">
-            {% for error in form.orgs.errors %}
-            <li class="text-danger">{{ error }}</li>
-            {% endfor %}
-          </ul>
-          {% endif %}
-
-        </div>
-
-        <div class="form-group">
-          <button class="btn btn-primary" type="submit">Save</button>
-        </div>
-
-      </form>
-
-    </div>
-  </div>
-</div>
-{% endblock content %}
diff --git a/tests/unit/staff/views/test_users.py b/tests/unit/staff/views/test_users.py
index 75fd456af..3b4f45d84 100644
--- a/tests/unit/staff/views/test_users.py
+++ b/tests/unit/staff/views/test_users.py
@@ -5,7 +5,6 @@
 from jobserver.authorization import (
     InteractiveReporter,
     OutputPublisher,
-    ProjectCollaborator,
     ProjectDeveloper,
 )
 from jobserver.models import User
@@ -270,8 +269,8 @@ def test_userdetailwithoauth_get_success(rf, core_developer):
     OrgMembershipFactory(org=org, user=user)
 
     # link the user to the Projects
-    ProjectMembershipFactory(project=project1, user=user, roles=[ProjectDeveloper])
-    ProjectMembershipFactory(project=project2, user=user, roles=[ProjectCollaborator])
+    ProjectMembershipFactory(project=project1, user=user)
+    ProjectMembershipFactory(project=project2, user=user)
 
     request = rf.get("/")
     request.user = core_developer
@@ -279,28 +278,6 @@ def test_userdetailwithoauth_get_success(rf, core_developer):
     response = UserDetailWithOAuth.as_view()(request, username=user.username)
 
     assert response.status_code == 200
-
-    assert response.context_data["orgs"] == [
-        {
-            "name": org.name,
-            "roles": [],
-            "staff_url": org.get_staff_url(),
-        },
-    ]
-
-    assert response.context_data["projects"] == [
-        {
-            "name": project1.name,
-            "roles": ["Project Developer"],
-            "staff_url": project1.get_staff_url(),
-        },
-        {
-            "name": project2.name,
-            "roles": ["Project Collaborator"],
-            "staff_url": project2.get_staff_url(),
-        },
-    ]
-
     assert response.context_data["user"] == user