diff --git a/app/controllers/epp/domains_controller.rb b/app/controllers/epp/domains_controller.rb
index bd68f9765..026faaf2f 100644
--- a/app/controllers/epp/domains_controller.rb
+++ b/app/controllers/epp/domains_controller.rb
@@ -126,7 +126,7 @@ class Epp::DomainsController < EppController
 
   def validate_create
     # TODO: Verify contact presence if registrant is juridical
-    ret = epp_request_valid?('name', 'ns', 'registrant', 'legalDocument', 'hostAttr')
+    ret = epp_request_valid?('name', 'ns', 'registrant', 'extension > extdata > legalDocument', 'ns > hostAttr')
 
     if params[:parsed_frame].css('dsData').count > 0 && params[:parsed_frame].css('create > keyData').count > 0
       epp_errors << { code: '2306', msg: I18n.t('ds_data_and_key_data_must_not_exists_together') }
diff --git a/spec/epp/domain_spec.rb b/spec/epp/domain_spec.rb
index 5af983f5f..e426baad0 100644
--- a/spec/epp/domain_spec.rb
+++ b/spec/epp/domain_spec.rb
@@ -80,7 +80,7 @@ describe 'EPP Domain', epp: true do
       expect(response[:results][1][:msg]).to eq('Required parameter missing: registrant')
 
       expect(response[:results][2][:result_code]).to eq('2003')
-      expect(response[:results][2][:msg]).to eq('Required parameter missing: legalDocument')
+      expect(response[:results][2][:msg]).to eq('Required parameter missing: extension > extdata > legalDocument')
     end
 
     context 'with two epp users' do
@@ -520,7 +520,7 @@ describe 'EPP Domain', epp: true do
 
         response = epp_request(xml, :xml)
         expect(response[:result_code]).to eq('2003')
-        expect(response[:msg]).to eq('Required parameter missing: hostAttr')
+        expect(response[:msg]).to eq('Required parameter missing: ns > hostAttr')
       end
 
       it 'creates domain with nameservers with ips' do