diff --git a/db/migrate/20180207071528_extract_user_id_from_epp_sessions_data.rb b/db/migrate/20180207071528_extract_user_id_from_epp_sessions_data.rb
new file mode 100644
index 000000000..24a5f25a6
--- /dev/null
+++ b/db/migrate/20180207071528_extract_user_id_from_epp_sessions_data.rb
@@ -0,0 +1,10 @@
+class ExtractUserIdFromEppSessionsData < ActiveRecord::Migration
+  def change
+    EppSession.all.each do |epp_session|
+      user_id = Marshal.load(::Base64.decode64(epp_session.data_before_type_cast))[:api_user_id]
+      user = ApiUser.find(user_id)
+      epp_session.user = user
+      epp_session.save!
+    end
+  end
+end
diff --git a/db/migrate/20180207072139_remove_epp_sessions_data.rb b/db/migrate/20180207072139_remove_epp_sessions_data.rb
new file mode 100644
index 000000000..90ec58740
--- /dev/null
+++ b/db/migrate/20180207072139_remove_epp_sessions_data.rb
@@ -0,0 +1,5 @@
+class RemoveEppSessionsData < ActiveRecord::Migration
+  def change
+    remove_column :epp_sessions, :data, :string
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index b925a2a1b..a6f29a47e 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -1051,7 +1051,6 @@ ALTER SEQUENCE domains_id_seq OWNED BY domains.id;
 CREATE TABLE epp_sessions (
     id integer NOT NULL,
     session_id character varying NOT NULL,
-    data text,
     created_at timestamp without time zone,
     updated_at timestamp without time zone,
     registrar_id integer,
@@ -5083,3 +5082,7 @@ INSERT INTO schema_migrations (version) VALUES ('20180206213435');
 
 INSERT INTO schema_migrations (version) VALUES ('20180206234620');
 
+INSERT INTO schema_migrations (version) VALUES ('20180207071528');
+
+INSERT INTO schema_migrations (version) VALUES ('20180207072139');
+