diff --git a/script/import_scripts/bbpress.rb b/script/import_scripts/bbpress.rb
index 89e2e4089..7f271b87a 100644
--- a/script/import_scripts/bbpress.rb
+++ b/script/import_scripts/bbpress.rb
@@ -40,6 +40,13 @@ def create_user(opts, import_id)
 
   u.save!
   u
+
+rescue
+  # try based on email
+  u = User.find_by(email: opts[:email].downcase)
+  u.custom_fields["import_id"] = import_id
+  u.save!
+  u
 end