diff --git a/db/migrate/20160201181320_fix_email_logs.rb b/db/migrate/20160201181320_fix_email_logs.rb
new file mode 100644
index 000000000..402761a8f
--- /dev/null
+++ b/db/migrate/20160201181320_fix_email_logs.rb
@@ -0,0 +1,16 @@
+class FixEmailLogs < ActiveRecord::Migration
+  def up
+    execute <<-SQL
+      UPDATE email_logs
+         SET user_id = u.id
+        FROM email_logs el
+   LEFT JOIN users u ON u.email = el.to_address
+       WHERE email_logs.id = el.id
+         AND email_logs.user_id IS NULL
+         AND NOT email_logs.skipped
+    SQL
+  end
+
+  def down
+  end
+end