diff --git a/app/controllers/cards/assignments_controller.rb b/app/controllers/cards/assignments_controller.rb
index fdd2a86dc..886537fa1 100644
--- a/app/controllers/cards/assignments_controller.rb
+++ b/app/controllers/cards/assignments_controller.rb
@@ -2,7 +2,8 @@ class Cards::AssignmentsController < ApplicationController
   include CardScoped
 
   def new
-    @users = @board.users.active.alphabetically
+    @assigned_to = @card.assignees.active.alphabetically.where.not(id: Current.user)
+    @users = @board.users.active.alphabetically.where.not(id: @card.assignees).where.not(id: Current.user)
     fresh_when etag: [ @users, @card.assignees ]
   end
 
diff --git a/app/views/cards/assignments/_user.html.erb b/app/views/cards/assignments/_user.html.erb
new file mode 100644
index 000000000..0d4eff888
--- /dev/null
+++ b/app/views/cards/assignments/_user.html.erb
@@ -0,0 +1,8 @@
+<li class="popup__item" data-filter-target="item" data-navigable-list-target="item" aria-checked="<%= card.assignees.include?(user) %>">
+  <%= button_to card_assignments_path(card, params: { assignee_id: user.id }), method: :post,
+        class: "popup__btn btn", form_class: "max-width flex-item-grow" do %>
+    <span class="overflow-ellipsis flex-item-grow"><%= local_assigns.fetch(:user_label, user.name) %></span>
+    <%= yield if block_given? %>
+    <%= icon_tag "check", size: 18, class: "checked flex-item-no-shrink flex-item-justify-end", style: "--icon-size: 1em" %>
+  <% end %>
+</li>
diff --git a/app/views/cards/assignments/new.html.erb b/app/views/cards/assignments/new.html.erb
index ee7f38c2d..6692a53f0 100644
--- a/app/views/cards/assignments/new.html.erb
+++ b/app/views/cards/assignments/new.html.erb
@@ -15,15 +15,11 @@
           type: "search", autocorrect: "off", autocomplete: "off", data: { "1p-ignore": "true", filter_target: "input", action: "input->filter#filter" } %>
 
     <ul class="popup__list" data-filter-target="list">
-      <% @users.each do |user| %>
-        <li class="popup__item" data-filter-target="item" data-navigable-list-target="item" aria-checked="<%= @card.assignees.include?(user) %>">
-          <%= button_to card_assignments_path(@card, params: { assignee_id: user.id }), method: :post,
-                class: "popup__btn btn", form_class: "max-width flex-item-grow" do %>
-            <span class="overflow-ellipsis flex-item-grow"><%= user.name %></span>
-            <%= icon_tag "check", size: 18, class: "checked flex-item-no-shrink flex-item-justify-end", style: "--icon-size: 1em" %>
-          <% end %>
-        </li>
+      <%= render "user", card: @card, user: Current.user, user_label: "Me" do %>
+        <span class="visually-hidden"><%= Current.user.name %></span>
       <% end %>
+      <%= render collection: @assigned_to, partial: "user", locals: { card: @card } %>
+      <%= render collection: @users, partial: "user", locals: { card: @card } %>
     </ul>
   <% end %>
 <% end %>