diff --git a/app/controllers/admin/domain_versions_controller.rb b/app/controllers/admin/domain_versions_controller.rb
index d43719966..8259f5a4b 100644
--- a/app/controllers/admin/domain_versions_controller.rb
+++ b/app/controllers/admin/domain_versions_controller.rb
@@ -9,7 +9,9 @@ class Admin::DomainVersionsController < AdminController
     if @domain.pending_json.present?
       frame = Nokogiri::XML(@domain.pending_json['frame'])
       @pending_user  = User.find(@domain.pending_json['current_user_id'])
-      @pending_domain = Epp::Domain.new_from_epp(frame, @pending_user)
+      @pending_domain = Epp::Domain.find(@domain.id)
+      @pending_domain.updated_at = @domain.pending_json['domain']['updated_at'].last
+      @pending_domain.update(frame, @pending_user, false)
     end
   end
   # rubocop:enable Style/GuardClause
diff --git a/app/views/admin/domain_versions/_version.haml b/app/views/admin/domain_versions/_version.haml
index 85adbf1c3..fd325559f 100644
--- a/app/views/admin/domain_versions/_version.haml
+++ b/app/views/admin/domain_versions/_version.haml
@@ -16,8 +16,8 @@
     - tech_contacts  = domain.tech_contacts
     - admin_contacts = domain.admin_contacts
     - registrant  = [domain.registrant]
-    - event       = ('PENDING<br>' + link_to(t(:manage), edit_admin_domain_path(params[:domain_id]))).html_safe
     - creator     = pending_user.try(:username)
+    - event       = 'PENDING'
   - else # if legacy data not presentable
     - nameservers    = []
     - tech_contacts  = []
@@ -29,16 +29,25 @@
   %td
     %p.nowrap
       = l(domain.updated_at, format: :short)
-      = event
     %p.text-right
+      = event
+      %br
       = creator
+      - if event == 'PENDING'
+        %br= link_to t(:manage), edit_admin_domain_path(params[:domain_id])
 
   %td
     %p
       = "#{domain.period}#{domain.period_unit}"
-      = "#{l(domain.valid_from, format: :date)} - #{l(domain.valid_to, format: :date)}"
+      %br
+      = "#{l(domain.valid_from, format: :date)}"
+      %br
+      = "#{l(domain.valid_to, format: :date)}"
+
+  %td
     %p
-      = domain.status
+      - domain.statuses.each do |s|
+        = s
 
   %td
     - registrant.each do |oc|
@@ -68,8 +77,8 @@
         = tc[:code]
 
   %td
-    - nameservers.each do |ns|
-      %p
+    %p
+      - nameservers.each do |ns|
         = ns[:hostname]
         %br
         = ns[:ipv4]
diff --git a/app/views/admin/domain_versions/index.haml b/app/views/admin/domain_versions/index.haml
index ef31d2c17..b697d7a17 100644
--- a/app/views/admin/domain_versions/index.haml
+++ b/app/views/admin/domain_versions/index.haml
@@ -9,7 +9,8 @@
         %thead
           %tr
             %th{class: 'col-xs-1'}= t(:timestap)
-            %th{class: 'col-xs-2'}= t(:period)
+            %th{class: 'col-xs-1'}= t(:period)
+            %th{class: 'col-xs-2'}= t(:statuses)
             %th{class: 'col-xs-2'}= t(:owner)
             %th{class: 'col-xs-2'}= t(:admin)
             %th{class: 'col-xs-2'}= t(:tech)