diff --git a/app/views/admin/domains/partials/_version.haml b/app/views/admin/domains/partials/_version.haml
index 3d06ff70e..d63b97837 100644
--- a/app/views/admin/domains/partials/_version.haml
+++ b/app/views/admin/domains/partials/_version.haml
@@ -1,4 +1,4 @@
-- statuses_link ||= false
+-#- statuses_link ||= false
 - version ||= false
 - domain ||= false
 - pending_user ||= false
@@ -18,14 +18,19 @@
     - dnskeys        = domain.dnskeys
     - tech_contacts  = domain.tech_contacts
     - admin_contacts = domain.admin_contacts
-    - registrant     = [domain.registrant ? domain.registrant : ContactVersion.where(item_id: domain.registrant_id).where(event: :destroy).last.reify]
+    - registrant     = domain.registrant
+    - unless registrant
+      - ver = ContactVersion.where(item_id: domain.registrant_id).where(event: :destroy).last
+      - registrant = ver.reify
+      - registrant.version_loader = ver
+    - registrant     = [registrant]
     - creator        = pending_user.try(:username)
     - event         = 'pending'
 
   %td
     %p.nowrap
       = l(domain.updated_at, format: :shorts)
-      - if statuses_link
+      -#- if statuses_link
         %br= link_to t(:edit_statuses), edit_admin_domain_path(params[:domain_id])
 
     %p.text-right
diff --git a/app/views/admin/domains/versions.haml b/app/views/admin/domains/versions.haml
index cfef69872..6dbf706f6 100644
--- a/app/views/admin/domains/versions.haml
+++ b/app/views/admin/domains/versions.haml
@@ -19,7 +19,7 @@
             %th{class: 'col-xs-2'}= t(:registrar)
 
         %tbody
-          - if @pending_domain.present?
+          -#- if @pending_domain.present?
             %tr.small
               = render 'admin/domains/partials/version',
                 domain: @pending_domain, pending_user: @pending_user, statuses_link: true