diff --git a/db/migrate/20110518010050_disable_password_reset_for_accounts_without_usernames.rb b/db/migrate/20110518010050_disable_password_reset_for_accounts_without_usernames.rb
new file mode 100644
index 000000000..fca3c53d0
--- /dev/null
+++ b/db/migrate/20110518010050_disable_password_reset_for_accounts_without_usernames.rb
@@ -0,0 +1,15 @@
+class DisablePasswordResetForAccountsWithoutUsernames < ActiveRecord::Migration
+  def self.up
+    execute <<SQL
+      UPDATE users
+        SET email = ""
+      WHERE username IS NULL
+        AND invitation_identifier IS NOT NULL
+        AND invitation_service = 'email'
+SQL
+  end
+
+  def self.down
+    raise ActiveRecord::IrreversibleMigration.new
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 0022f75ec..b11a750c6 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110517180148) do
+ActiveRecord::Schema.define(:version => 20110518010050) do
 
   create_table "aspect_memberships", :force => true do |t|
     t.integer  "aspect_id",  :null => false