diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f0311c7a5b..57b1b01a47 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -127,9 +127,13 @@ def speaker_links(event)
   end
 
   def speaker_selector_input(form)
-    users = User.active.pluck(:id, :name, :username, :email).map { |user| [user[0], user[1].blank? ? user[2] : user[1], user[2], user[3]] }.sort_by { |user| user[1].downcase }
+    users = User.active.pluck(:id, :username).map { |user| 
+      [user[0], user[1]] 
+    }.sort_by { |user| 
+      user[1].downcase 
+    }
     form.input :speakers, as: :select,
-                          collection: options_for_select(users.map {|user| ["#{user[1]} (#{user[2]}) #{user[3]}", user[0]]}, @event.speakers.map(&:id)),
+                          collection: options_for_select(users.map {|user| [user[1], user[0]]}, @event.speakers.map(&:id)),
                           include_blank: false, label: 'Speakers', input_html: { class: 'select-help-toggle', multiple: 'true' }
   end