diff --git a/app/views/admin/spending_proposals/edit.html.erb b/app/views/admin/spending_proposals/edit.html.erb
index 022fdb0c9..502c9baae 100644
--- a/app/views/admin/spending_proposals/edit.html.erb
+++ b/app/views/admin/spending_proposals/edit.html.erb
@@ -6,20 +6,10 @@
                  label: false },
                class: "js-submit-on-change" %>
 
-  <div id="valuators-assign-list" class="row">
-    <% @valuators.each do |valuator| %>
-      <div class="small-12 medium-4 column end">
-        <%= check_box_tag "valuator_ids_#{valuator.id}",
-                          valuator.id, @spending_proposal.valuators.include?(valuator),
-                          name: 'spending_proposal[valuator_ids][]',
-                          class: "js-submit-on-change" %>
-        <%= label_tag "valuator_ids_#{valuator.id}", truncate(valuator.name), class: "inline" %>
-      </div>
-    <% end %>
-
-    <% if @valuators.blank? %>
-      <p><%= t("admin.spending_proposals.show.no_valuators") %></p>
-    <% end %>
+  <div class="row">
+    <div class="small-12 medium-4 column end">
+      <%= f.collection_check_boxes :valuator_ids, @valuators, :id, :name %>
+    </div>
   </div>
 
   <div class="small-12 column">
diff --git a/spec/features/admin/spending_proposals_spec.rb b/spec/features/admin/spending_proposals_spec.rb
index f7c53cd7a..d291c3680 100644
--- a/spec/features/admin/spending_proposals_spec.rb
+++ b/spec/features/admin/spending_proposals_spec.rb
@@ -273,10 +273,8 @@ feature 'Admin spending proposals' do
 
     visit edit_admin_spending_proposal_path(spending_proposal)
 
-    within('#valuators-assign-list') do
-      check "valuator_ids_#{valuator1.id}"
-      check "valuator_ids_#{valuator3.id}"
-    end
+    check "spending_proposal_valuator_ids_#{valuator1.id}"
+    check "spending_proposal_valuator_ids_#{valuator3.id}"
 
     click_button 'Update'