diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index c5e298cff..f97b1d164 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -160,7 +160,7 @@ class Epp::Domain < Domain
     code = registrant_frame.try(:text)
     if code.present?
       if action == 'chg' && registrant_change_prohibited?
-        add_epp_error('2304', nil, DomainStatus::SERVER_REGISTRANT_CHANGE_PROHIBITED, I18n.t(:object_status_prohibits_operation))
+        add_epp_error('2304', "status", DomainStatus::SERVER_REGISTRANT_CHANGE_PROHIBITED, I18n.t(:object_status_prohibits_operation))
       end
       regt = Registrant.find_by(code: code)
       if regt
diff --git a/app/views/epp/error.xml.builder b/app/views/epp/error.xml.builder
index 3f2aa37f0..ef92bdadd 100644
--- a/app/views/epp/error.xml.builder
+++ b/app/views/epp/error.xml.builder
@@ -7,10 +7,10 @@ xml.epp_head do
         xml.value('xmlns:obj' => 'urn:ietf:params:xml:ns:obj') do
           if (val = x[:value][:val]).respond_to?(:each)
             val.each do |el|
-              xml.tag!("obj:#{x[:value][:obj]}", el)
+              xml.tag!("#{controller.controller_name}:#{x[:value][:obj]}", el)
             end
           else
-            xml.tag!("obj:#{x[:value][:obj]}", val)
+            xml.tag!("#{controller.controller_name}:#{x[:value][:obj]}", val)
           end
         end if x[:value]