diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 177c4566..9492cdce 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -2,13 +2,7 @@ class Admin::UsersController < ApplicationController
   before_filter :verify_admin
 
   def index
-    @users = User.all(:joins => :person,
-                      :order => "people.last_name ASC",
-                      :select => "users.*,
-                                  people.last_name AS last_name,
-                                  people.first_name AS first_name,
-                                  people.public_name AS public_name,
-                                  people.email AS email")
+    @users = User.joins(:person).order('people.last_name ASC')
   end
 
   def update
@@ -28,4 +22,4 @@ class Admin::UsersController < ApplicationController
     
   end  
 
-end
\ No newline at end of file
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index d4a32cf7..ee6ef34f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -17,6 +17,8 @@ class User < ActiveRecord::Base
   before_save :setup_role
   before_create :create_person
 
+  delegate :last_name, :first_name, :public_name, to: :person
+
   def role?(role)
     Rails.logger.debug("Checking role in user")
     return !!self.roles.find_by_name(role.to_s.camelize)