diff --git a/app/controllers/concerns/epp/common.rb b/app/controllers/concerns/epp/common.rb
index 91f44a8b7..f30c09f4d 100644
--- a/app/controllers/concerns/epp/common.rb
+++ b/app/controllers/concerns/epp/common.rb
@@ -45,7 +45,7 @@ module Epp::Common
             code: code,
             msg: err[:msg],
             value: {obj: err[:obj], val: err[:val]},
-          } and break if values.any? {|x| I18n.t("errors.messages.#{x}") == err[:msg] }
+          } and break if values.any? {|x| obj.errors.generate_message(key, x) == err[:msg]}
         else
           epp_errors << {
             code: code,
diff --git a/app/helpers/epp/domains_helper.rb b/app/helpers/epp/domains_helper.rb
index 9b40581ba..cf0f4af81 100644
--- a/app/helpers/epp/domains_helper.rb
+++ b/app/helpers/epp/domains_helper.rb
@@ -60,7 +60,7 @@ module Epp::DomainsHelper
     super({
       '2302' => [:epp_domain_taken, :epp_domain_reserved],
       '2306' => [:blank, [:out_of_range, {min: 1, max: 13}]],
-      '2303' => [:epp_contact_not_found]
+      '2303' => [:not_found]
       }, @domain
     )
   end
diff --git a/app/models/domain.rb b/app/models/domain.rb
index 75051a98a..5aac31007 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -38,7 +38,7 @@ class Domain < ActiveRecord::Base
         errors.add(:domain_contacts, {
           obj: 'contact',
           val: x[:contact],
-          msg: I18n.t('errors.messages.epp_contact_not_found')
+          msg: errors.generate_message(:domain_contacts, :not_found)
         })
       end
     end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7af627268..253adadf7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -43,6 +43,8 @@ en:
               blank: 'Required parameter missing - registrant'
             admin_contacts:
               blank: 'Required parameter missing - admin contact'
+            domain_contacts:
+              not_found: 'Contact was not found'
             nameservers:
               blank: 'Required parameter missing - nameserver'
               out_of_range: 'Domain must have %{min}-%{max} nameservers'
@@ -53,5 +55,4 @@ en:
       epp_domain_taken: 'Domain name already exists'
       epp_obj_does_not_exist: 'Object does not exist'
       epp_command_failed: 'Command failed'
-      epp_contact_not_found: 'Contact was not found'
       epp_nameservers_range_fail: 'Domain must have %{min}-%{max} nameservers'