diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
index 6a770c72f..6d0dd55fb 100644
--- a/app/controllers/aspects_controller.rb
+++ b/app/controllers/aspects_controller.rb
@@ -32,7 +32,7 @@ class AspectsController < ApplicationController
       all_selected_people = Person.joins(:contacts => :aspect_memberships).
         where(:contacts => {:user_id => current_user.id},
               :aspect_memberships => {:aspect_id => aspect_ids})
-      @selected_people = all_selected_people.select("DISTINCT people.*").order('RAND()').limit(20).includes(:profile)
+      @selected_people = all_selected_people.select("DISTINCT people.*").includes(:profile)
     end
 
     @aspect_ids = @aspects.map { |a| a.id }
@@ -45,7 +45,7 @@ class AspectsController < ApplicationController
     if params[:only_posts]
       render :partial => 'shared/stream', :locals => {:posts => @posts}
     else
-      @contact_count = all_selected_people.count
+      @contact_count = @selected_people.count
 
       @aspect = :all unless params[:a_ids]
       @aspect ||= @aspects.first # used in mobile
diff --git a/app/views/aspects/index.js.erb b/app/views/aspects/index.js.erb
index c001b58f0..acf2b8961 100644
--- a/app/views/aspects/index.js.erb
+++ b/app/views/aspects/index.js.erb
@@ -1,3 +1,3 @@
 $('#aspect_stream_container').html("<%= escape_javascript(render('aspects/aspect_stream', :aspect => @aspect, :aspect_ids => @aspect_ids, :posts => @posts)) %>");
-$('#selected_aspect_contacts').html("<%= escape_javascript(render('aspects/selected_contacts', :people => @selected_people[0..19], :count => @contact_count )) %>");
+$('#selected_aspect_contacts').html("<%= escape_javascript(render('aspects/selected_contacts', :people => @selected_people.sample(20), :count => @contact_count )) %>");
 $('#aspect_stream_container a[rel*=facebox]').facebox();