diff --git a/app/controllers/admin/domain_versions_controller.rb b/app/controllers/admin/domain_versions_controller.rb
index 283c84f97..2585ab894 100644
--- a/app/controllers/admin/domain_versions_controller.rb
+++ b/app/controllers/admin/domain_versions_controller.rb
@@ -1,5 +1,7 @@
 module Admin
   class DomainVersionsController < BaseController
+    include ObjectVersionsHelper
+
     load_and_authorize_resource
 
     def index
diff --git a/app/views/admin/contact_versions/index.haml b/app/views/admin/contact_versions/index.haml
index 0367db3be..519161a10 100644
--- a/app/views/admin/contact_versions/index.haml
+++ b/app/views/admin/contact_versions/index.haml
@@ -58,7 +58,7 @@
           - @versions.each do |version|
             - if version
             - contact = Contact.new(version.object.to_h)
-            - version.object_changes.to_h.each { |k,v| contact.public_send("#{k}=", v.last) }
+            - attach_existing_fields(version, contact)
 
               %tr
                 %td= link_to(contact.name, admin_contact_version_path(version.id))
diff --git a/app/views/admin/contact_versions/show.haml b/app/views/admin/contact_versions/show.haml
index e19326fca..713f03046 100644
--- a/app/views/admin/contact_versions/show.haml
+++ b/app/views/admin/contact_versions/show.haml
@@ -1,5 +1,5 @@
 - contact = Contact.new(@version.object.to_h)
-- @version.object_changes.to_h.each { |k,v| contact.public_send("#{k}=", v.last ) }
+- attach_existing_fields(@version, contact)
 = render 'shared/title', name: contact.name
 
 .row
@@ -41,11 +41,11 @@
 
           %br
 
-          %dt= t(:created)
+          %dt= t(:created_at)
           %dd{class: changing_css_class(@version,"created_at")}
             = l(contact.created_at, format: :short)
 
-          %dt= t(:updated)
+          %dt= t(:updated_at)
           %dd{class: changing_css_class(@version,"updated_at")}
             = l(contact.updated_at, format: :short)
 
diff --git a/test/integration/admin/contact_versions_test.rb b/test/integration/admin/contact_versions_test.rb
new file mode 100644
index 000000000..25e44f5a1
--- /dev/null
+++ b/test/integration/admin/contact_versions_test.rb
@@ -0,0 +1,60 @@
+require 'test_helper'
+
+class ContactVersionsTest < ActionDispatch::IntegrationTest
+  def setup
+    super
+
+    create_contact_with_history
+    login_as users(:admin)
+  end
+
+  def teardown
+    super
+
+    delete_objects_once_done
+  end
+
+  def create_contact_with_history
+    sql = <<-SQL.squish
+      INSERT INTO registrars (id, name, reg_no, email, country_code, code,
+      accounting_customer_code, language)
+      VALUES (75, 'test_registrar', 'test123', 'test@test.com', 'EE', 'TEST123',
+      'test123', 'en');
+
+      INSERT INTO contacts (id, code, auth_info, registrar_id)
+      VALUES (75, 'test_code', '8b4d462aa04194ca78840a', 75);
+
+      INSERT INTO log_contacts (item_type, item_id, event, whodunnit, object,
+      object_changes, created_at, session, children, ident_updated_at, uuid)
+      VALUES ('Contact', 75, 'update', '1-AdminUser',
+      '{"id": 75, "code": "test_code", "auth_info": "8b4d462aa04194ca78840a", "registrar_id": 75}',
+      '{"other_made_up_field": "value"}',
+      '2018-04-23 15:50:48.113491', '2018-04-23 12:44:56',
+      '{"legal_documents":[null]}', null, null
+      )
+    SQL
+
+    ActiveRecord::Base.connection.execute(sql)
+  end
+
+  def delete_objects_once_done
+    ActiveRecord::Base.connection.execute('DELETE from log_contacts where item_id = 75')
+    Domain.destroy_all
+    Contact.destroy_all
+    Registrar.destroy_all
+  end
+
+  def test_removed_fields_are_not_causing_errors_in_index_view
+    visit admin_contact_versions_path
+    assert_text 'test_registrar'
+    assert_text 'update 23.04.18, 18:50'
+  end
+
+  def test_removed_fields_are_not_causing_errors_in_details_view
+    version_id = Contact.find(75).versions.last
+    visit admin_contact_version_path(version_id)
+
+    assert_text 'test_registrar'
+    assert_text '23.04.18, 18:50 update 1-AdminUser'
+  end
+end