diff --git a/app/controllers/admins_controller.rb b/app/controllers/admins_controller.rb
index b5d18e3aa..37231b0dd 100644
--- a/app/controllers/admins_controller.rb
+++ b/app/controllers/admins_controller.rb
@@ -3,17 +3,9 @@ class AdminsController < ApplicationController
   before_filter :redirect_unless_admin
 
   def user_search
-    user = params[:user] || {}
-    user = user.delete_if {|key, value| value.blank? }
-    params[:user] = user
-
-    if user.keys.count == 0
-      @users = []
-    else
-      @users = User.where(params[:user]).all || []
-    end
-
-    render 'user_search'
+    params[:user] ||= {}
+    params[:user].delete_if {|key, value| value.blank? }
+    @users = params[:user].empty? ? [] : User.where(params[:user])
   end
 
   def add_invites
diff --git a/spec/controllers/admins_controller_spec.rb b/spec/controllers/admins_controller_spec.rb
index c56bc6e33..57721ace2 100644
--- a/spec/controllers/admins_controller_spec.rb
+++ b/spec/controllers/admins_controller_spec.rb
@@ -23,9 +23,10 @@ describe AdminsController do
         AppConfig[:admins] = [@user.username]
       end
 
-      it 'succeeds' do
+      it 'succeeds and renders user_search' do
         get :user_search
         response.should be_success
+        response.should render_template(:user_search)
       end
 
       it 'assigns users to an empty array if nothing is searched for' do