diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index b180afa27..c9cf21125 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -294,7 +294,7 @@ class ProjectsController < ApplicationController
   end
 
   def assigned_users_list
-    users = User.where(id: @project.user_assignments.select(:user_id)).order('full_name ASC')
+    users = @project.users.search(false, params[:query]).order(:full_name)
 
     render json: { data: users.map { |u| [u.id, u.name, { avatar_url: avatar_path(u, :icon_small) }] } }, status: :ok
   end
diff --git a/app/javascript/vue/projects/renderers/superviser.vue b/app/javascript/vue/projects/renderers/superviser.vue
index 22aedc03c..77522a3e8 100644
--- a/app/javascript/vue/projects/renderers/superviser.vue
+++ b/app/javascript/vue/projects/renderers/superviser.vue
@@ -16,6 +16,7 @@
         <div class="px-2">
           <div class="sci-input-container-v2 left-icon mb-1 -mx-2.5">
             <input type="text"
+                    ref="searchInput"
                     v-model="query"
                     class="sci-input-field"
                     autofocus="true"
@@ -74,9 +75,16 @@ export default {
       this.loadUsers();
     }
   },
+  mounted() {
+    this.$nextTick(() => {
+      if (this.$refs.searchInput) {
+        this.$refs.searchInput.focus();
+      }
+    });
+  },
   computed: {
     canManage() {
-      return this.params.data.urls.assigned_users;
+      return this.params.data.urls.assigned_users && !this.params.data.archived_on;
     }
   },
   methods: {