diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 177c4566..765f4bdc 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -2,14 +2,13 @@ class Admin::UsersController < ApplicationController
   before_filter :verify_admin
 
   def index
-    @users = User.all(:joins => :person,
-                      :order => "people.last_name ASC",
-                      :select => "users.*,
+    @users = User.select("users.*,
                                   people.last_name AS last_name,
                                   people.first_name AS first_name,
                                   people.public_name AS public_name,
-                                  people.email AS email")
-  end
+                                  people.email AS email").joins(:person).load.order("people.last_name ASC")
+
+ end
 
   def update
     user = User.find(params[:id])
@@ -28,4 +27,4 @@ class Admin::UsersController < ApplicationController
     
   end  
 
-end
\ No newline at end of file
+end