diff --git a/db/migrate/20180724154947_drop_personal_key_columns_from_user.rb b/db/migrate/20180724154947_drop_personal_key_columns_from_user.rb
new file mode 100644
index 00000000000..32e9337f9af
--- /dev/null
+++ b/db/migrate/20180724154947_drop_personal_key_columns_from_user.rb
@@ -0,0 +1,17 @@
+class DropPersonalKeyColumnsFromUser < ActiveRecord::Migration[5.1]
+  def up
+    safety_assured do
+      remove_column :users, :recovery_code
+      remove_column :users, :encryption_key
+      remove_column :users, :recovery_salt
+      remove_column :users, :recovery_cost
+    end
+  end
+
+  def down
+    add_column :users, :recovery_code, :string
+    add_column :users, :encryption_key, :string
+    add_column :users, :recovery_salt, :string
+    add_column :users, :recovery_cost, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index bf2f5a85943..5a97b222297 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -212,11 +212,7 @@
     t.datetime "direct_otp_sent_at"
     t.datetime "idv_attempted_at"
     t.integer "idv_attempts", default: 0
-    t.string "recovery_code"
-    t.string "encryption_key"
     t.string "unique_session_id"
-    t.string "recovery_salt"
-    t.string "recovery_cost"
     t.string "email_fingerprint", default: "", null: false
     t.text "encrypted_email", default: "", null: false
     t.string "attribute_cost"