diff --git a/app/views/cards/assignments/_user.html.erb b/app/views/cards/assignments/_user.html.erb
index 0d4eff888..b2e885649 100644
--- a/app/views/cards/assignments/_user.html.erb
+++ b/app/views/cards/assignments/_user.html.erb
@@ -1,4 +1,4 @@
-<li class="popup__item" data-filter-target="item" data-navigable-list-target="item" aria-checked="<%= card.assignees.include?(user) %>">
+<li class="popup__item" data-filter-target="item" data-navigable-list-target="item" <%= tag.attributes(data: local_assigns.fetch(:data, {})) %> 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>
diff --git a/app/views/cards/assignments/new.html.erb b/app/views/cards/assignments/new.html.erb
index 609478550..9c753fc0a 100644
--- a/app/views/cards/assignments/new.html.erb
+++ b/app/views/cards/assignments/new.html.erb
@@ -23,9 +23,7 @@
       <% end %>
       <%= render collection: @assigned_to, partial: "user", locals: { card: @card } %>
       <% @users.each do |user| %>
-        <span data-assignment-limit-target="unassigned">
-          <%= render "user", card: @card, user: user %>
-        </span>
+        <%= render "user", card: @card, user: user, data: { assignment_limit_target: "unassigned" } %>
       <% end %>
     </ul>