diff --git a/app/models/epp/contact.rb b/app/models/epp/contact.rb
index 7727666d2..303113f02 100644
--- a/app/models/epp/contact.rb
+++ b/app/models/epp/contact.rb
@@ -7,7 +7,6 @@ class Epp::Contact < Contact
   self.inheritance_column = :sti_disabled
 
   before_validation :manage_permissions
-  before_update :write_update_values
 
   def manage_permissions
     return unless update_prohibited? || delete_prohibited?
@@ -15,11 +14,6 @@ class Epp::Contact < Contact
     false
   end
 
-  def write_update_values
-    self.upid = current_user.identity_code if current_user
-    self.updated_at = Time.zone.now
-  end
-
   class << self
     # support legacy search
     def find_by_epp_code(code)
@@ -186,7 +180,8 @@ class Epp::Contact < Contact
       end
     end
 
-    @current_user = current_user
+    self.upid = current_user.id if current_user
+    self.update = Time.zone.now
 
     super(at)
   end
diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index 8769acc1e..aca475cf5 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -6,7 +6,6 @@ class Epp::Domain < Domain
   attr_accessor :is_renewal, :is_transfer, :current_user
 
   before_validation :manage_permissions
-  before_update :write_update_values
 
   def manage_permissions
     return if is_admin # this bad hack for 109086524, refactor later
@@ -16,11 +15,6 @@ class Epp::Domain < Domain
     false
   end
 
-  def write_update_values
-    self.upid = current_user.identity_code if current_user
-    self.updated_at = Time.zone.now
-  end
-
   after_validation :validate_contacts
   def validate_contacts
     return true if is_renewal || is_transfer
@@ -495,7 +489,8 @@ class Epp::Domain < Domain
 
     # at[:statuses] += at_add[:domain_statuses_attributes]
 
-    @current_user = current_user
+    self.upid = current_user.id if current_user
+    self.update = Time.zone.now
 
     if errors.empty? && verify &&
        Setting.request_confrimation_on_registrant_change_enabled &&
diff --git a/db/migrate/20160225113801_add_up_id_value_to_domain.rb b/db/migrate/20160225113801_add_up_id_value_to_domain.rb
index df3d70e6f..9879c8555 100644
--- a/db/migrate/20160225113801_add_up_id_value_to_domain.rb
+++ b/db/migrate/20160225113801_add_up_id_value_to_domain.rb
@@ -1,5 +1,5 @@
 class AddUpIdValueToDomain < ActiveRecord::Migration
   def change
-    add_column :domains, :upid, :string
+    add_column :domains, :upid, :integer
   end
 end
diff --git a/db/migrate/20160225113812_add_up_id_value_to_contact.rb b/db/migrate/20160225113812_add_up_id_value_to_contact.rb
index 927950bd2..b78478e75 100644
--- a/db/migrate/20160225113812_add_up_id_value_to_contact.rb
+++ b/db/migrate/20160225113812_add_up_id_value_to_contact.rb
@@ -1,5 +1,5 @@
 class AddUpIdValueToContact < ActiveRecord::Migration
   def change
-    add_column :contacts, :upid, :string
+    add_column :contacts, :upid, :integer
   end
 end
diff --git a/db/migrate/20160226132045_add_up_date_value_to_domain.rb b/db/migrate/20160226132045_add_up_date_value_to_domain.rb
new file mode 100644
index 000000000..c3568e6dd
--- /dev/null
+++ b/db/migrate/20160226132045_add_up_date_value_to_domain.rb
@@ -0,0 +1,5 @@
+class AddUpDateValueToDomain < ActiveRecord::Migration
+  def change
+    add_column :domains, :update, :timestamp
+  end
+end
diff --git a/db/migrate/20160226132056_add_up_date_value_to_contact.rb b/db/migrate/20160226132056_add_up_date_value_to_contact.rb
new file mode 100644
index 000000000..99f90d662
--- /dev/null
+++ b/db/migrate/20160226132056_add_up_date_value_to_contact.rb
@@ -0,0 +1,5 @@
+class AddUpDateValueToContact < ActiveRecord::Migration
+  def change
+    add_column :contacts, :update, :timestamp
+  end
+end