diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 318923e3d..de54dafc5 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -67,8 +67,7 @@ class ApplicationController < ActionController::Base
   end
 
   def user_log_str(user)
-    return 'public' if user.nil?
-    "#{user.id}-#{user.class}: #{user.username}"
+    user.nil? ? 'public' : user.string
   end
 
   def comma_support_for(parent_key, key)
diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index 3471cf131..9418b54fd 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -504,6 +504,7 @@ class Epp::Domain < Domain
     old_registrant_email = DomainMailer.registrant_updated_notification_for_old_registrant(id, deliver_emails)
     preclean_pendings
     user  = ApiUser.find(pending_json['current_user_id'])
+    ::PaperTrail.whodunnit = user.string # updator str should be the request originator not the approval user
     frame = Nokogiri::XML(pending_json['frame'])
     statuses.delete(DomainStatus::PENDING_UPDATE)
     yield(self) if block_given? # need to skip statuses check here
diff --git a/app/models/user.rb b/app/models/user.rb
index 0beb174f3..5d415230c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -3,4 +3,9 @@ class User < ActiveRecord::Base
   devise :trackable, :timeoutable
 
   attr_accessor :phone
+
+  def string
+    "#{self.id}-#{self.class}: #{self.username}"
+  end
+
 end
diff --git a/app/views/epp/contacts/info.xml.builder b/app/views/epp/contacts/info.xml.builder
index 18019208a..965e2340a 100644
--- a/app/views/epp/contacts/info.xml.builder
+++ b/app/views/epp/contacts/info.xml.builder
@@ -46,15 +46,13 @@ xml.epp_head do
           xml.tag!('contact:email', 'No access')
         end
 
-        xml.tag!('contact:clID', @contact.registrar.try(:name))
-        if @contact.creator.try(:registrar).blank? && Rails.env.test?
-          xml.tag!('contact:crID', 'TEST-CREATOR')
-        else
-          xml.tag!('contact:crID', @contact.creator.try(:registrar))
-        end
+        xml.tag!('contact:clID', @contact.registrar.try(:code))
+
+        xml.tag!('contact:crID', @contact.creator.registrar.try(:code))
         xml.tag!('contact:crDate', @contact.created_at.try(:iso8601))
+
         if @contact.updated_at != @contact.created_at
-          xml.tag!('contact:upID', @contact.updator.try(:registrar))
+          xml.tag!('contact:upID', @contact.updator.registrar.code) if @contact.updator.try(:registrar).present?
           xml.tag!('contact:upDate', @contact.updated_at.try(:iso8601))
         end
         # xml.tag!('contact:trDate', '123') if false
diff --git a/app/views/epp/domains/info.xml.builder b/app/views/epp/domains/info.xml.builder
index d3ffd22d5..181eabc67 100644
--- a/app/views/epp/domains/info.xml.builder
+++ b/app/views/epp/domains/info.xml.builder
@@ -36,19 +36,18 @@ xml.epp_head do
 
         ## TODO Find out what this domain:host is all about
 
-        xml.tag!('domain:clID', @domain.registrar_name)
-
-        xml.tag!('domain:crID', @domain.creator.try(:registrar) || @domain.creator) if @domain.creator
+        xml.tag!('domain:clID', @domain.registrar.code)
 
+        xml.tag!('domain:crID', @domain.creator.registrar.code) if @domain.creator
         xml.tag!('domain:crDate', @domain.created_at.try(:iso8601))
 
-        xml.tag!('domain:upDate', @domain.updated_at.try(:iso8601)) if @domain.updated_at != @domain.created_at
+        if @domain.updated_at != @domain.created_at
+          xml.tag!('domain:upID', @domain.updator.registrar.code) if @domain.updator.try(:registrar).present?
+          xml.tag!('domain:upDate', @domain.updated_at.try(:iso8601))
+        end
 
         xml.tag!('domain:exDate', @domain.valid_to.try(:iso8601))
 
-        # TODO Make domain stampable
-        #xml.tag!('domain:upID', @domain.updated_by)
-
         # TODO Make domain transferrable
         #xml.tag!('domain:trDate', @domain.transferred_at) if @domain.transferred_at