diff --git a/app/models/domain.rb b/app/models/domain.rb
index 3751da5b6..772fdcf40 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -656,16 +656,7 @@ class Domain < ActiveRecord::Base
   end
 
   def pending_update_prohibited?
-    (statuses_was & [
-        DomainStatus::PENDING_DELETE_CONFIRMATION,
-        DomainStatus::CLIENT_UPDATE_PROHIBITED,
-        DomainStatus::SERVER_UPDATE_PROHIBITED,
-        DomainStatus::PENDING_CREATE,
-        DomainStatus::PENDING_UPDATE,
-        DomainStatus::PENDING_DELETE,
-        DomainStatus::PENDING_RENEW,
-        DomainStatus::PENDING_TRANSFER
-    ]).present?
+    (statuses_was & DomainStatus::UPDATE_PROHIBIT_STATES).present?
   end
 
   def set_pending_update
@@ -689,17 +680,7 @@ class Domain < ActiveRecord::Base
   end
 
   def pending_delete_prohibited?
-    (statuses_was & [
-      DomainStatus::CLIENT_DELETE_PROHIBITED,
-      DomainStatus::SERVER_DELETE_PROHIBITED,
-      DomainStatus::CLIENT_UPDATE_PROHIBITED,
-      DomainStatus::SERVER_UPDATE_PROHIBITED,
-      DomainStatus::PENDING_CREATE,
-      DomainStatus::PENDING_RENEW,
-      DomainStatus::PENDING_TRANSFER,
-      DomainStatus::PENDING_UPDATE,
-      DomainStatus::PENDING_DELETE
-    ]).present?
+    (statuses_was & DomainStatus::DELETE_PROHIBIT_STATES).present?
   end
 
   # let's use positive method names
diff --git a/app/models/domain_status.rb b/app/models/domain_status.rb
index c784a86e3..4da6a4a3c 100644
--- a/app/models/domain_status.rb
+++ b/app/models/domain_status.rb
@@ -95,6 +95,29 @@ class DomainStatus < ActiveRecord::Base
     SERVER_ADMIN_CHANGE_PROHIBITED, SERVER_TECH_CHANGE_PROHIBITED
   ]
 
+  UPDATE_PROHIBIT_STATES = [
+      DomainStatus::PENDING_DELETE_CONFIRMATION,
+      DomainStatus::CLIENT_UPDATE_PROHIBITED,
+      DomainStatus::SERVER_UPDATE_PROHIBITED,
+      DomainStatus::PENDING_CREATE,
+      DomainStatus::PENDING_UPDATE,
+      DomainStatus::PENDING_DELETE,
+      DomainStatus::PENDING_RENEW,
+      DomainStatus::PENDING_TRANSFER
+  ]
+
+  DELETE_PROHIBIT_STATES = [
+      DomainStatus::CLIENT_DELETE_PROHIBITED,
+      DomainStatus::SERVER_DELETE_PROHIBITED,
+      DomainStatus::CLIENT_UPDATE_PROHIBITED,
+      DomainStatus::SERVER_UPDATE_PROHIBITED,
+      DomainStatus::PENDING_CREATE,
+      DomainStatus::PENDING_RENEW,
+      DomainStatus::PENDING_TRANSFER,
+      DomainStatus::PENDING_UPDATE,
+      DomainStatus::PENDING_DELETE
+  ]
+
   def epp_code_map
     {
       '2302' => [ # Object exists
diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index c6d5d2d7e..be8f2f6eb 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -11,7 +11,8 @@ class Epp::Domain < Domain
     return if is_admin # this bad hack for 109086524, refactor later
     return true if is_transfer || is_renewal
     return unless update_prohibited? || delete_prohibited?
-    add_epp_error('2304', nil, nil, I18n.t(:object_status_prohibits_operation))
+    stat = (statuses & (DomainStatus::UPDATE_PROHIBIT_STATES + DomainStatus::DELETE_PROHIBIT_STATES)).first
+    add_epp_error('2304', 'status', stat, I18n.t(:object_status_prohibits_operation))
     false
   end
 
@@ -143,7 +144,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/models/nameserver.rb b/app/models/nameserver.rb
index 86cd7e002..7b4daab3d 100644
--- a/app/models/nameserver.rb
+++ b/app/models/nameserver.rb
@@ -24,7 +24,7 @@ class Nameserver < ActiveRecord::Base
   def epp_code_map
     {
         '2302' => [
-            [:hostname, :taken, { value: { obj: 'hostAttr', val: hostname } }]
+            [:hostname, :taken, { value: { obj: 'hostAttr', val: {'hostName': hostname} } }]
         ],
         '2005' => [
             [:hostname, :invalid, { value: { obj: 'hostAttr', val: hostname } }],
diff --git a/app/views/epp/error.xml.builder b/app/views/epp/error.xml.builder
index 796856f4c..fceb800b7 100644
--- a/app/views/epp/error.xml.builder
+++ b/app/views/epp/error.xml.builder
@@ -3,9 +3,26 @@ xml.epp_head do
     @errors.each do |x|
       xml.result('code' => x[:code]) do
         xml.msg(x[:msg], 'lang' => 'en')
+        model_name = resource ? resource.model_name.singular.sub('epp_','') : controller.controller_name.singularize
 
-        xml.value('xmlns:obj' => 'urn:ietf:params:xml:ns:obj') do
-          xml.tag!("obj:#{x[:value][:obj]}", x[:value][:val])
+        xml.value("xmlns:#{model_name}" => "https://epp.tld.ee/schema/#{model_name}-eis-1.0.xsd") do
+          value = x[:value][:val]
+          attrs = {}
+          attrs["s"] = value if x[:value][:obj] == "status"
+
+          if (val = value).respond_to?(:each)
+            val.each do |el|
+              if el.kind_of?(Array)
+                xml.tag!("#{model_name}:#{x[:value][:obj]}") do
+                  xml.tag!("#{model_name}:#{el[0]}", el[1], attrs)
+                end
+              else
+                xml.tag!("#{model_name}:#{x[:value][:obj]}", el, attrs)
+              end
+            end
+          else
+            xml.tag!("#{model_name}:#{x[:value][:obj]}", val, attrs)
+          end
         end if x[:value]
 
         x[:ext_values].each do |y|
diff --git a/spec/epp/domain_spec.rb b/spec/epp/domain_spec.rb
index 8e3997649..ccf13c8b5 100644
--- a/spec/epp/domain_spec.rb
+++ b/spec/epp/domain_spec.rb
@@ -134,7 +134,7 @@ describe 'EPP Domain', epp: true do
 
       key = d.dnskeys.last
 
-      key.ds_alg.should == 3
+      key.ds_alg.should == 5
       key.ds_key_tag.should_not be_blank
 
       key.ds_digest_type.should == Setting.ds_algorithm