diff --git a/app/helpers/whodunnit_helper.rb b/app/helpers/whodunnit_helper.rb
index 871cabd71..ed32990e0 100644
--- a/app/helpers/whodunnit_helper.rb
+++ b/app/helpers/whodunnit_helper.rb
@@ -10,4 +10,16 @@ module WhodunnitHelper
   rescue ActiveRecord::RecordNotFound
     return nil
   end
+
+  def whodunnit_with_protocol(whodunnit)
+    return nil unless whodunnit
+    if whodunnit.include?('-EppUser')
+      user = EppUser.find(whodunnit)
+      return "#{user.username} (EPP)"
+    end
+    user = User.find(whodunnit)
+    return user.username
+  rescue ActiveRecord::RecordNotFound
+    return nil
+  end
 end
diff --git a/app/views/client/contact_versions/index.haml b/app/views/client/contact_versions/index.haml
index 7cf96b6f4..4cc0c9547 100644
--- a/app/views/client/contact_versions/index.haml
+++ b/app/views/client/contact_versions/index.haml
@@ -26,7 +26,7 @@
           - @versions.each do |x|
             %tr
               %td= x.event
-              %td= link_to_whodunnit(x.whodunnit)
+              %td= whodunnit_with_protocol(x.whodunnit)
               %td= l(x.created_at, format: :short)
               %td= link_to(t('shared.contact'), client_contact_path(x.item_id))
               %td= link_to(t('shared.details'), client_contact_version_path(x, event: x.event))
diff --git a/app/views/client/domain_versions/index.haml b/app/views/client/domain_versions/index.haml
index c438a863f..0280e1b81 100644
--- a/app/views/client/domain_versions/index.haml
+++ b/app/views/client/domain_versions/index.haml
@@ -17,7 +17,7 @@
               = t('shared.whodunnit')
             %th{class: 'col-xs-2'}
               = t('shared.created_at')
-            %th{class: 'col-xs-1'}
+            -#%th{class: 'col-xs-1'}
               = t('shared.item_id')
               =# sort_link(@q, 'email', t('shared.email'))
             %th{class: 'col-xs-1'}
@@ -27,9 +27,9 @@
           - @versions.each do |x|
             %tr
               %td= x.event
-              %td= link_to_whodunnit(x.whodunnit)
+              %td= whodunnit_with_protocol(x.whodunnit)
               %td= l(x.created_at, format: :short)
-              %td= link_to(t('shared.domain'), client_domain_path(x.item_id))
+              -#%td= link_to(t('shared.domain'), client_domain_path(x.item_id))
               %td= link_to(t('shared.details'), client_domain_version_path(x, event: x.event))
 .row
   .col-md-12