diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index df8ec371c..02ae71316 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -72,8 +72,8 @@ class Epp::Domain < Domain
 
   def attach_default_contacts
     return if registrant.blank?
-    tech_contacts  << registrant if tech_contacts.blank?
-    admin_contacts << registrant if admin_contacts.blank? && registrant.priv?
+    tech_contacts  << registrant if tech_domain_contacts.blank?
+    admin_contacts << registrant if admin_domain_contacts.blank? && registrant.priv?
   end
 
   # rubocop: disable Metrics/PerceivedComplexity
diff --git a/spec/epp/domain_spec.rb b/spec/epp/domain_spec.rb
index 9fbd99eb8..f74fbe63d 100644
--- a/spec/epp/domain_spec.rb
+++ b/spec/epp/domain_spec.rb
@@ -94,8 +94,8 @@ describe 'EPP Domain', epp: true do
       response[:clTRID].should == 'ABC-12345'
 
       d.registrar.name.should == 'registrar1'
-      d.tech_contacts.count.should == 3
-      d.admin_contacts.count.should == 2
+      d.tech_contacts.count.should == 2
+      d.admin_contacts.count.should == 1
 
       d.nameservers.count.should == 2
       d.auth_info.should_not be_empty