diff --git a/app/models/domain.rb b/app/models/domain.rb
index d5db03798..2a03277de 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -528,8 +528,13 @@ class Domain < ActiveRecord::Base
     Registrant.find_by(id: pending_json['domain']['registrant_id'].last)
   end
 
-  # rubocop:disable Lint/Loop
   def generate_auth_info
+    return if auth_info.present?
+    generate_auth_info!
+  end
+
+  # rubocop:disable Lint/Loop
+  def generate_auth_info!
     begin
       self.auth_info = SecureRandom.hex
     end while self.class.exists?(auth_info: auth_info)
diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index f34312bc6..c1852fef5 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -616,7 +616,7 @@ class Epp::Domain < Domain
       if dt.approved?
         transfer_contacts(current_user.registrar_id)
         dt.notify_losing_registrar(old_contact_codes, old_registrant_code)
-        generate_auth_info
+        generate_auth_info!
         self.registrar = current_user.registrar
       end
 
diff --git a/spec/support/epp.rb b/spec/support/epp.rb
index db6b522c5..b14eb79a7 100644
--- a/spec/support/epp.rb
+++ b/spec/support/epp.rb
@@ -353,9 +353,7 @@ module Epp
     defaults = {
       name: { value: next_domain_name },
       period: nil,
-      authInfo: {
-        pw: { value: '98oiewslkfkd', attrs: { roid: 'citizen_1234-REP' } }
-      }
+      authInfo: nil
     }
 
     xml_params = defaults.deep_merge(xml_params)