diff --git a/app/models/epp/contact.rb b/app/models/epp/contact.rb
index a2a4e60ef..cb1145a92 100644
--- a/app/models/epp/contact.rb
+++ b/app/models/epp/contact.rb
@@ -193,7 +193,7 @@ class Epp::Contact < Contact
       end
     end
 
-    self.upid = current_user.id if current_user
+    self.upid = current_user.registrar.id if current_user.registrar
     self.up_date = Time.zone.now
 
     super(at)
diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index e5e821702..32293785e 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -508,13 +508,16 @@ class Epp::Domain < Domain
 
     end
 
+    if erros.empty? && verify
+      self.upid = current_user.registrar.id if current_user.registrar
+      self.up_date = Time.zone.now
+    end
+
     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