diff --git a/Gemfile b/Gemfile
index 8405e0902..d5660ed19 100644
--- a/Gemfile
+++ b/Gemfile
@@ -91,7 +91,9 @@ gem 'digidoc_client', '0.2.1'
 
 # epp
 gem 'epp', '1.4.2', github: 'internetee/epp'
-gem 'epp-xml',   '1.0.4' # EIS EPP XMLs
+gem 'epp-xml',   '1.0.4',
+    github: 'internetee/epp-xml',
+    ref: '287fe8705ca2f344ea670b922dd9f08635efc7af' # EIS EPP XMLs
 gem 'uuidtools', '2.1.5' # For unique IDs (used by the epp gem)
 
 # que
diff --git a/app/models/depp/domain.rb b/app/models/depp/domain.rb
index 05fd2fef9..997a6b693 100644
--- a/app/models/depp/domain.rb
+++ b/app/models/depp/domain.rb
@@ -66,8 +66,9 @@ module Depp
 
     def delete(domain_params)
       xml = epp_xml.delete({
-        name: { value: domain_params[:name] }
-      }, Depp::Domain.construct_custom_params_hash(domain_params))
+        name: { value: domain_params[:name] }},
+        Depp::Domain.construct_custom_params_hash(domain_params),
+        (domain_params[:verified].present? && 'yes'))
 
       current_user.request(xml)
     end
@@ -187,12 +188,6 @@ module Depp
           }
         end
 
-        if domain_params[:verified].present?
-          custom_params[:_anonymus] << {
-            registrant_verified: { value: 'yes' }
-          }
-        end
-
         if domain_params[:reserved_pw].present?
           custom_params[:_anonymus] << { reserved: { pw: { value: domain_params[:reserved_pw] } } }
         end
@@ -223,6 +218,11 @@ module Depp
           chg = [{ registrant: { value: domain_params[:registrant] } }]
         end
 
+        if domain_params[:registrant] != old_domain_params[:registrant]
+          chg = [{ registrant: { value: domain_params[:registrant] } }] if !domain_params[:verified].present?
+          chg = [{ registrant: { value: domain_params[:registrant], attrs: { verified: 'yes' } } }] if domain_params[:verified]
+        end
+
         add_arr = nil if add_arr.none?
         rem_arr = nil if rem_arr.none?