diff --git a/app/interactions/actions/contact_create.rb b/app/interactions/actions/contact_create.rb
index 84ed10caf..f3e6560b8 100644
--- a/app/interactions/actions/contact_create.rb
+++ b/app/interactions/actions/contact_create.rb
@@ -19,12 +19,12 @@ module Actions
     def maybe_change_email
       return if Rails.env.test?
 
-      [:regex, :mx].each do |m|
+      %i[regex mx].each do |m|
         result = Actions::SimpleMailValidator.run(email: contact.email, level: m)
-
         next if result
 
-        contact.add_epp_error('2005', nil, "email didn't pass validation", I18n.t(:parameter_value_syntax_error))
+        err_text = "email '#{contact.email}' didn't pass validation"
+        contact.add_epp_error('2005', nil, nil, "#{I18n.t(:parameter_value_syntax_error)} #{err_text}")
         @error = true
         return
       end
diff --git a/app/interactions/actions/contact_update.rb b/app/interactions/actions/contact_update.rb
index 685f1474c..3442a5643 100644
--- a/app/interactions/actions/contact_update.rb
+++ b/app/interactions/actions/contact_update.rb
@@ -23,11 +23,12 @@ module Actions
     def maybe_change_email
       return if Rails.env.test?
 
-      [:regex, :mx].each do |m|
+      %i[regex mx].each do |m|
         result = Actions::SimpleMailValidator.run(email: @new_attributes[:email], level: m)
         next if result
 
-        contact.add_epp_error('2005', nil, "email didn't pass validation", I18n.t(:parameter_value_syntax_error))
+        err_text = "email '#{new_attributes[:email]}' didn't pass validation"
+        contact.add_epp_error('2005', nil, nil, "#{I18n.t(:parameter_value_syntax_error)} #{err_text}")
         @error = true
         return
       end
diff --git a/app/interactions/actions/domain_update.rb b/app/interactions/actions/domain_update.rb
index c610e0117..3c408e11f 100644
--- a/app/interactions/actions/domain_update.rb
+++ b/app/interactions/actions/domain_update.rb
@@ -136,11 +136,12 @@ module Actions
     def validate_email(email)
       return true if Rails.env.test?
 
-      [:regex, :mx].each do |m|
+      %i[regex mx].each do |m|
         result = Actions::SimpleMailValidator.run(email: email, level: m)
         next if result
 
-        domain.add_epp_error('2005', nil, "#{email} didn't pass validation", I18n.t(:parameter_value_syntax_error))
+        err_text = "email #{email} didn't pass validation"
+        domain.add_epp_error('2005', nil, nil, "#{I18n.t(:parameter_value_syntax_error)} #{err_text}")
         @error = true
         return
       end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2f7e8a0aa..28d2d0281 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -371,7 +371,7 @@ en:
   sim_error: 'SIM application error'
   internal_error: 'Internal error'
   client_side_status_editing_error: 'Parameter value policy error. Client-side object status management not supported'
-  parameter_value_syntax_error: 'Parameter value syntax error: '
+  parameter_value_syntax_error: 'Parameter value syntax error:'
 
   # DEPP
   activemodel: