diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index b92a33e5a..737a434d6 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -489,14 +489,13 @@ class Epp::Domain < Domain
 
     # at[:statuses] += at_add[:domain_statuses_attributes]
 
-    self.upid = current_user.id if current_user
-    self.up_date = Time.zone.now
-
     if errors.empty? && verify &&
        Setting.request_confrimation_on_registrant_change_enabled &&
        frame.css('registrant').present? &&
        frame.css('registrant').attr('verified').to_s.downcase != 'yes'
       registrant_verification_asked!(frame.to_s, current_user.id)
+      self.upid = current_user.registrar.id if current_user.registrar
+      self.up_date = Time.zone.now
     end
     self.deliver_emails = true # turn on email delivery for epp