diff --git a/app/models/user.rb b/app/models/user.rb
index 3646d2d2430..86201b3c2e5 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,4 +1,5 @@
 class User < ApplicationRecord
+  self.ignored_columns = %w[x509_dn_uuid]
   include NonNullUuid
 
   devise(
diff --git a/db/migrate/20191217010300_drop_x509_dn_uuid_column_from_user.rb b/db/migrate/20200102010300_drop_x509_dn_uuid_column_from_user.rb
similarity index 55%
rename from db/migrate/20191217010300_drop_x509_dn_uuid_column_from_user.rb
rename to db/migrate/20200102010300_drop_x509_dn_uuid_column_from_user.rb
index 70cd116650f..c09ccf0be73 100644
--- a/db/migrate/20191217010300_drop_x509_dn_uuid_column_from_user.rb
+++ b/db/migrate/20200102010300_drop_x509_dn_uuid_column_from_user.rb
@@ -1,5 +1,7 @@
 class DropX509DnUuidColumnFromUser < ActiveRecord::Migration[5.1]
   def change
-    remove_column :users, :x509_dn_uuid
+    safety_assured do
+      remove_column :users, :x509_dn_uuid
+    end
   end
 end