diff --git a/app/helpers/epp/domains_helper.rb b/app/helpers/epp/domains_helper.rb
index 9d1ea6332..4999e68c5 100644
--- a/app/helpers/epp/domains_helper.rb
+++ b/app/helpers/epp/domains_helper.rb
@@ -178,7 +178,10 @@ module Epp::DomainsHelper
       return nil
     end
 
-    if domain.registrar != current_epp_user.registrar && secure[:secure] == true
+    @ph[:authInfo] ||= {}
+    return domain if domain.auth_info == @ph[:authInfo][:pw]
+
+    if (domain.registrar != current_epp_user.registrar && secure[:secure] == true) &&
       epp_errors << {
         code: '2302',
         msg: I18n.t('errors.messages.domain_exists_but_belongs_to_other_registrar'),