diff --git a/app/models/concerns/versions.rb b/app/models/concerns/versions.rb
index 8d18a2b22..39dd6b5ab 100644
--- a/app/models/concerns/versions.rb
+++ b/app/models/concerns/versions.rb
@@ -34,6 +34,16 @@ module Versions
       end
     end
 
+    def updator
+      return nil if updator_str.blank?
+
+      if updator_str =~ /^\d-api-/
+        ApiUser.find(updator_str)
+      else
+        User.find(updator_str)
+      end
+    end
+
     # callbacks
     def touch_domain_version
       domain.try(:touch_with_version)
diff --git a/app/views/epp/contacts/info.xml.builder b/app/views/epp/contacts/info.xml.builder
index e354be0b2..0f4560041 100644
--- a/app/views/epp/contacts/info.xml.builder
+++ b/app/views/epp/contacts/info.xml.builder
@@ -12,11 +12,12 @@ xml.epp_head do
         xml.tag!('contact:fax', @contact.fax) if @disclosure.try(:fax) || @owner
         xml.tag!('contact:email', @contact.email) if @disclosure.try(:email) || @owner
         xml.tag!('contact:clID', @contact.registrar.try(:name))
-
-        #xml.tag!('contact:crID', @contact.cr_id ) if @contact.cr_id
+        xml.tag!('contact:crID', @contact.creator.try(:registrar)) 
         xml.tag!('contact:crDate', @contact.created_at)
-        xml.tag!('contact:upID', @contact.up_id) if @contact.up_id
-        xml.tag!('contact:upDate', @contact.updated_at) unless @contact.updated_at == @contact.created_at
+        if @contact.updated_at != @contact.created_at
+          xml.tag!('contact:upID', @contact.updator.try(:registrar))
+          xml.tag!('contact:upDate', @contact.updated_at) 
+        end
         xml.tag!('contact:ident', @contact.ident, type: @contact.ident_type)
         xml.tag!('contact:trDate', '123') if false
         if @owner