diff --git a/app/assets/javascripts/access_permissions/projects.js b/app/assets/javascripts/access_permissions/user_assignments.js
similarity index 100%
rename from app/assets/javascripts/access_permissions/projects.js
rename to app/assets/javascripts/access_permissions/user_assignments.js
diff --git a/app/views/access_permissions/partials/_default_public_user_role_form.html.erb b/app/views/access_permissions/partials/_default_public_user_role_form.html.erb
index 1e13d77b8..96f9a9d8e 100644
--- a/app/views/access_permissions/partials/_default_public_user_role_form.html.erb
+++ b/app/views/access_permissions/partials/_default_public_user_role_form.html.erb
@@ -5,7 +5,7 @@
     </div>
     <div>
       <%= t('access_permissions.everyone_else', team_name: project.team.name) %>
-      <%= render 'access_permissions/partials/public_members_dropdown', team: project.team, project: project %>
+      <%= render 'access_permissions/partials/public_members_dropdown', team: project.team, assignable: project %>
       <br>
       <small class="text-muted">
         <%= project.default_public_user_role.name %>
diff --git a/app/views/access_permissions/partials/_public_members_dropdown.html.erb b/app/views/access_permissions/partials/_public_members_dropdown.html.erb
index 8022f022b..16c32b32b 100644
--- a/app/views/access_permissions/partials/_public_members_dropdown.html.erb
+++ b/app/views/access_permissions/partials/_public_members_dropdown.html.erb
@@ -5,14 +5,8 @@
       <div class="title">
         <%= t('.title', team: team.name) %>
       </div>
-      <%
-        users_excluded = if defined? project
-                           project.manually_assigned_users.select(:id)
-                         elsif protocol
-                           protocol.manually_assigned_users.select(:id)
-                         end
-      %>
-      <% team.users.order(full_name: :asc).where.not(id: users_excluded).each do |user| %>
+      <% users_excluded_id = assignable.manually_assigned_users.select(:id) %>
+      <% team.users.order(full_name: :asc).where.not(id: users_excluded_id).each do |user| %>
         <div class="name">
           <%= user.full_name %>
         </div>