diff --git a/app/views/admin/domains/partials/_version.haml b/app/views/admin/domains/partials/_version.haml
index f48482b3c..38c4474e8 100644
--- a/app/views/admin/domains/partials/_version.haml
+++ b/app/views/admin/domains/partials/_version.haml
@@ -14,6 +14,7 @@
     - registrant     = Contact.all_versions_for(children[:registrant], version.created_at)
     - event          = version.event
     - creator        = plain_username(version.terminator)
+    - whodunnit      = version.try(:whodunnit)
   - else # pending history
     - epp_req = false
     - nameservers    = domain.nameservers
@@ -27,7 +28,8 @@
       - registrant.version_loader = ver
     - registrant     = [registrant]
     - creator        = pending_user.try(:username)
-    - event         = 'pending'
+    - event          = 'pending'
+    - whodunnit      = false
 
   %td
     %p.nowrap
@@ -41,7 +43,10 @@
       - else
         = event
       %br
-      = creator
+      - if whodunnit
+        = whodunnit
+      - else
+        = creator
     - if version
       %p.text-right
         = link_to "Pure history", admin_domain_version_path(version)