diff --git a/app/interactions/actions/domain_create.rb b/app/interactions/actions/domain_create.rb
index a60e0e635..970d74b3b 100644
--- a/app/interactions/actions/domain_create.rb
+++ b/app/interactions/actions/domain_create.rb
@@ -120,7 +120,7 @@ module Actions
       contact = Contact.find_by(code: contact_code)
       arr = admin ? @admin_contacts : @tech_contacts
       if contact
-        arr << { contact_id: contact.id }
+        arr << { contact_id: contact.id, contact_code: contact.code }
       else
         domain.add_epp_error('2303', 'contact', contact_code, %i[domain_contacts not_found])
       end
diff --git a/app/interactions/actions/domain_update.rb b/app/interactions/actions/domain_update.rb
index 5508f641e..a86b038ff 100644
--- a/app/interactions/actions/domain_update.rb
+++ b/app/interactions/actions/domain_update.rb
@@ -125,7 +125,7 @@ module Actions
     end
 
     def start_validate_email(props)
-      contact = Contact.find(props[0][:contact_id])
+      contact = Contact.find_by(code: props[0][:contact_code])
 
       return if contact.nil?
 
@@ -205,7 +205,7 @@ module Actions
         domain.add_epp_error('2306', 'contact', code,
                              %i[domain_contacts admin_contact_can_be_only_private_person])
       else
-        add ? { contact_id: obj.id } : { id: obj.id, _destroy: 1 }
+        add ? { contact_id: obj.id, contact_code: obj.code } : { id: obj.id, _destroy: 1 }
       end
     end
 
diff --git a/app/models/domain_contact.rb b/app/models/domain_contact.rb
index 1f85d9242..4a791493f 100644
--- a/app/models/domain_contact.rb
+++ b/app/models/domain_contact.rb
@@ -10,6 +10,7 @@ class DomainContact < ApplicationRecord
 
   after_destroy :update_contact
   attr_accessor :value_typeahead
+  attr_writer :contact_code
 
   self.ignored_columns = %w[legacy_domain_id legacy_contact_id]