diff --git a/db/migrate/20170710145821_add_confirmable_to_user.rb b/db/migrate/20170710145821_add_confirmable_to_user.rb
index 31739e64e1..cd458545e0 100644
--- a/db/migrate/20170710145821_add_confirmable_to_user.rb
+++ b/db/migrate/20170710145821_add_confirmable_to_user.rb
@@ -6,8 +6,8 @@ class AddConfirmableToUser < ActiveRecord::Migration
     add_column :spree_users, :unconfirmed_email, :string
     add_index :spree_users, :confirmation_token, :unique => true
 
-    # Set users to confirmed if they previously confirmed their email for an enterprise
-    execute "UPDATE spree_users SET confirmed_at = enterprises.confirmed_at FROM enterprises WHERE spree_users.email = enterprises.email AND enterprises.confirmed_at IS NOT NULL"
+    # Set all current users to confirmed
+    Spree::User.update_all(confirmed_at: Time.zone.now)
   end
 
   def down