diff --git a/app/models/contact.rb b/app/models/contact.rb
index 5181d722f..d014f7af8 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -23,7 +23,7 @@ class Contact < ActiveRecord::Base
   validates :ident,
     format: { with: /\d{4}-\d{2}-\d{2}/, message: :invalid_birthday_format },
     if: proc { |c| c.ident_type == 'birthday' }
-  validates :ident_country_code, presence: true, if: proc { |c| %w(org priv).include? c.ident_type }
+  validates :ident_country_code, presence: true, if: proc { |c| %w(org priv).include? c.ident_type }, on: :create
   validates :code,
     uniqueness: { message: :epp_id_taken },
     format: { with: /\A[\w\-\:]*\Z/i, message: :invalid },
diff --git a/app/models/epp/contact.rb b/app/models/epp/contact.rb
index 435a63dee..ec5673b06 100644
--- a/app/models/epp/contact.rb
+++ b/app/models/epp/contact.rb
@@ -104,6 +104,7 @@ class Epp::Contact < Contact
       res
     end
   end
+  delegate :ident_attr_valid?, to: :class
 
   def epp_code_map # rubocop:disable Metrics/MethodLength
     {