diff --git a/lib/generators/devise/devise/templates/migration.rb b/lib/generators/devise/devise/templates/migration.rb
index ccdace20..dcc2aeac 100644
--- a/lib/generators/devise/devise/templates/migration.rb
+++ b/lib/generators/devise/devise/templates/migration.rb
@@ -2,11 +2,11 @@ class DeviseCreate<%= table_name.camelize %> < ActiveRecord::Migration
   def self.up
     create_table(:<%= table_name %>) do |t|
       t.database_authenticatable :null => false
-      t.confirmable
       t.recoverable
       t.rememberable
       t.trackable
 
+      # t.confirmable
       # t.lockable :lock_strategy => :<%= Devise.lock_strategy %>, :unlock_strategy => :<%= Devise.unlock_strategy %>
       # t.token_authenticatable
 
@@ -14,8 +14,8 @@ class DeviseCreate<%= table_name.camelize %> < ActiveRecord::Migration
     end
 
     add_index :<%= table_name %>, :email,                :unique => true
-    add_index :<%= table_name %>, :confirmation_token,   :unique => true
     add_index :<%= table_name %>, :reset_password_token, :unique => true
+    # add_index :<%= table_name %>, :confirmation_token,   :unique => true
     # add_index :<%= table_name %>, :unlock_token,         :unique => true
   end