diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb
index b7f020606..b93b353ab 100644
--- a/app/controllers/people_controller.rb
+++ b/app/controllers/people_controller.rb
@@ -11,8 +11,9 @@ class PeopleController < ApplicationController
   def index
     @aspect = :search
     params[:q] ||= params[:term]
+    limit = params[:limit] || 15
 
-    @people = Person.search(params[:q], current_user).paginate :page => params[:page], :per_page => 15
+    @people = Person.search(params[:q], current_user).paginate :page => params[:page], :per_page => limit
     @hashes = hashes_for_people(@people, @aspects)
     #only do it if it is an email address
     if params[:q].try(:match, Devise.email_regexp)
diff --git a/public/javascripts/search.js b/public/javascripts/search.js
index b833c6eb8..204be2a3b 100644
--- a/public/javascripts/search.js
+++ b/public/javascripts/search.js
@@ -25,7 +25,9 @@ var Search = {
   },
   options : function(){return {
       minChars : 3,
-      max : 4,
+      max : 5,
+      scroll : false,
+      extraParams : {limit : 4},
       formatItem : Search.formatItem,
       formatResult : Search.formatResult,
       parse : Search.parse,