diff --git a/app/helpers/valuation_helper.rb b/app/helpers/valuation_helper.rb
index 9e3a054c1..1d74e94fa 100644
--- a/app/helpers/valuation_helper.rb
+++ b/app/helpers/valuation_helper.rb
@@ -2,9 +2,9 @@ module ValuationHelper
 
   def valuator_select_options(valuator=nil)
     if valuator.present?
-      Valuator.where.not(id: valuator.id).order('users.username asc').includes(:user).collect { |v| [ v.name, v.id ] }.prepend([valuator.name, valuator.id])
+      Valuator.where.not(id: valuator.id).order('users.username asc').includes(:user).collect { |v| [ v.description_or_email, v.id ] }.prepend([valuator.description_or_email, valuator.id])
     else
-      Valuator.all.order('users.username asc').includes(:user).collect { |v| [ v.name, v.id ] }
+      Valuator.all.order('users.username asc').includes(:user).collect { |v| [ v.description_or_email, v.id ] }
     end
   end
 
diff --git a/spec/features/admin/spending_proposals_spec.rb b/spec/features/admin/spending_proposals_spec.rb
index a14ff0316..16a140de6 100644
--- a/spec/features/admin/spending_proposals_spec.rb
+++ b/spec/features/admin/spending_proposals_spec.rb
@@ -144,8 +144,8 @@ feature 'Admin spending proposals' do
     end
 
     scenario "Filtering by valuator", :js do
-      user = create(:user, username: 'Valuator 1')
-      valuator = create(:valuator, user: user)
+      user = create(:user)
+      valuator = create(:valuator, user: user, description: 'Valuator 1')
 
       spending_proposal = create(:spending_proposal, title: "Realocate visitors")
       spending_proposal.valuators << valuator