diff --git a/app/jobs/update_whois_record_job.rb b/app/jobs/update_whois_record_job.rb
index 71f2b7e19..c397dfdc9 100644
--- a/app/jobs/update_whois_record_job.rb
+++ b/app/jobs/update_whois_record_job.rb
@@ -14,6 +14,7 @@ class UpdateWhoisRecordJob < Que::Job
       else
         send "delete_#{type}", name
       end
+      ::PaperTrail.whodunnit = "job - #{self.class.name} - #{type}"
     end
   end
 
diff --git a/app/models/domain.rb b/app/models/domain.rb
index 8bac1c2dc..428f43c8c 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -434,6 +434,7 @@ class Domain < ActiveRecord::Base
     # TODO: if this were to ever return true, that would be wrong. EPP would report sucess pending
     return true unless registrant_verification_asked?
     pending_delete_confirmation!
+    ::PaperTrail.whodunnit = "#{self.class.name} - #{__method__}"
     save(validate: false) # should check if this did succeed
 
     DomainMailer.pending_deleted(id, registrant_id_was, deliver_emails).deliver