diff --git a/app/controllers/admin/contacts_controller.rb b/app/controllers/admin/contacts_controller.rb
index 5135f2c7f..23d743719 100644
--- a/app/controllers/admin/contacts_controller.rb
+++ b/app/controllers/admin/contacts_controller.rb
@@ -3,7 +3,7 @@ class Admin::ContactsController < AdminController
   before_action :set_contact, only: [:show]
 
   def index
-    @q = Contact.search(params[:q])
+    @q = Contact.includes(:registrar).search(params[:q])
     @contacts = @q.result.page(params[:page])
   end
 
@@ -14,6 +14,6 @@ class Admin::ContactsController < AdminController
   private
 
   def set_contact
-    @contact = Contact.find(params[:id])
+    @contact = Contact.includes(domains: :registrar).find(params[:id])
   end
 end
diff --git a/app/views/admin/contacts/index.haml b/app/views/admin/contacts/index.haml
index e25620663..fcbbd47a5 100644
--- a/app/views/admin/contacts/index.haml
+++ b/app/views/admin/contacts/index.haml
@@ -24,20 +24,20 @@
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'name', t(:name))
             %th{class: 'col-xs-2'}
-              = sort_link(@q, 'ident', t(:identity))
+              = sort_link(@q, 'code', t(:code))
+            %th{class: 'col-xs-2'}
+              = sort_link(@q, 'ident', t(:ident))
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'email', t(:email))
-            %th{class: 'col-xs-2'}
-              = sort_link(@q, 'code', t(:code))
             %th{class: 'col-xs-2'}
               = sort_link(@q, 'registrar_name', t(:registrar))
         %tbody
           - @contacts.each do |contact|
             %tr
               %td= link_to(contact, admin_contact_path(contact))
+              %td= contact.code
               %td= ident_for(contact)
               %td= contact.email
-              %td= contact.code
               %td
                 - if contact.registrar
                   = link_to(contact.registrar, admin_registrar_path(contact.registrar))