diff --git a/app/controllers/client/contact_versions_controller.rb b/app/controllers/client/contact_versions_controller.rb
index e71a7682d..e4f824c44 100644
--- a/app/controllers/client/contact_versions_controller.rb
+++ b/app/controllers/client/contact_versions_controller.rb
@@ -2,7 +2,7 @@ class Client::ContactVersionsController < ClientController
   before_action :set_version, only: [:show]
 
   def index
-    @versions = ContactVersion.registrar_events(current_user.registrar.id)
+    @versions = ContactVersion.registrar_events(current_registrar.id)
     @versions.flatten!
   end
 
diff --git a/app/controllers/client/domain_versions_controller.rb b/app/controllers/client/domain_versions_controller.rb
index 0c83330a0..87f48cd45 100644
--- a/app/controllers/client/domain_versions_controller.rb
+++ b/app/controllers/client/domain_versions_controller.rb
@@ -2,7 +2,7 @@ class Client::DomainVersionsController < ClientController
   before_action :set_version, only: [:show]
 
   def index
-    @versions = DomainVersion.registrar_events(current_user.registrar.id)
+    @versions = DomainVersion.registrar_events(current_registrar.id)
     @versions.flatten!
   end
 
diff --git a/app/models/concerns/user_events.rb b/app/models/concerns/user_events.rb
index 992d6cecb..7513e9788 100644
--- a/app/models/concerns/user_events.rb
+++ b/app/models/concerns/user_events.rb
@@ -4,10 +4,10 @@ module UserEvents
   module ClassMethods
     def registrar_events(id)
       registrar = Registrar.find(id)
-      return nil unless registrar
+      return [] unless registrar
       @events = []
       registrar.users.each { |user| @events << user_events(user.id) }
-      registrar.epp_users.each { |user| @events << user_events(user.id) }
+      registrar.epp_users.each { |user| @events << epp_user_events(user.id) }
       @events
     end
 
diff --git a/app/models/contact_version.rb b/app/models/contact_version.rb
index fc84be9ad..a60e02da4 100644
--- a/app/models/contact_version.rb
+++ b/app/models/contact_version.rb
@@ -1,32 +1,9 @@
 class ContactVersion < PaperTrail::Version
+  include UserEvents
+
   scope :deleted, -> { where(event: 'destroy') }
 
   self.table_name = :contact_versions
   self.sequence_name = :contact_version_id_seq
 
-  class << self
-
-    def registrar_events(id)
-      registrar = Registrar.find(id)
-      @events = []
-      registrar.users.each { |user| @events << user_contacts(user.id) }
-      registrar.epp_users.each { |user| @events << user_contacts(user.id) }
-      @events
-    end
-
-    def user_events(id, epp_user_id=nil)
-      contacts = []
-      contacts << user_contacts(id)
-      contacts << epp_user_contacts(epp_user_id) if epp_user_id
-      contacts
-    end
-
-    def user_contacts(id)
-      where(whodunnit: id.to_s)
-    end
-
-    def epp_user_contacts(id)
-      where(whodunnit: "#{id}-EppUser")
-    end
-  end
 end