diff --git a/app/controllers/admin/officials_controller.rb b/app/controllers/admin/officials_controller.rb
index 023f0f7fc..f83aa1e18 100644
--- a/app/controllers/admin/officials_controller.rb
+++ b/app/controllers/admin/officials_controller.rb
@@ -1,11 +1,11 @@
 class Admin::OfficialsController < Admin::BaseController
 
   def index
-    @officials = User.officials.page(params[:page])
+    @officials = User.officials.page(params[:page]).for_render
   end
 
   def search
-    @users = User.with_email(params[:email]).page(params[:page])
+    @users = User.with_email(params[:email]).page(params[:page]).for_render
   end
 
   def edit
@@ -29,4 +29,4 @@ class Admin::OfficialsController < Admin::BaseController
       params.require(:user).permit(:official_position, :official_level)
     end
 
-end
\ No newline at end of file
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 7cff8d732..d7b77a7e0 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -25,11 +25,11 @@ class User < ActiveRecord::Base
 
   accepts_nested_attributes_for :organization
 
-  default_scope { includes(:organization) }
   scope :administrators, -> { joins(:administrators) }
   scope :moderators,     -> { joins(:moderator) }
   scope :organizations,  -> { joins(:organization) }
   scope :officials,      -> { where("official_level > 0") }
+  scope :for_render,     -> { includes(:organization) }
 
   def self.find_for_oauth(auth, signed_in_resource = nil)
     # Get the identity and user if they exist