diff --git a/db/migrate/20170731030330_fix_primary_emails_for_staged_users.rb b/db/migrate/20170731030330_fix_primary_emails_for_staged_users.rb
new file mode 100644
index 00000000000..d31e7578ef3
--- /dev/null
+++ b/db/migrate/20170731030330_fix_primary_emails_for_staged_users.rb
@@ -0,0 +1,28 @@
+class FixPrimaryEmailsForStagedUsers < ActiveRecord::Migration
+  def up
+    execute <<~SQL
+    INSERT INTO user_emails (
+      user_id,
+      email,
+      "primary",
+      created_at,
+      updated_at
+    ) SELECT
+      users.id,
+      email_tokens.email,
+      'TRUE',
+      users.created_at,
+      users.updated_at
+    FROM users
+    LEFT JOIN user_emails ON user_emails.user_id = users.id
+    LEFT JOIN email_tokens ON email_tokens.user_id = users.id
+    WHERE staged
+    AND NOT active
+    AND user_emails.id IS NULL
+    SQL
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end