diff --git a/db/migrate/20111007155450_devise_create_admin_users.rb b/db/migrate/20111007155450_devise_create_admin_users.rb
deleted file mode 100644
index 516496d..0000000
--- a/db/migrate/20111007155450_devise_create_admin_users.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-class DeviseCreateAdminUsers < ActiveRecord::Migration
-  def self.up
-    create_table(:admin_users) do |t|
-      t.database_authenticatable :null => false
-      t.recoverable
-      t.rememberable
-      t.trackable
-
-      # t.encryptable
-      t.confirmable
-      t.lockable :lock_strategy => :failed_attempts, :unlock_strategy => :both
-      # t.token_authenticatable
-
-
-      t.timestamps
-    end
-
-    add_index :admin_users, :email,                :unique => true
-    add_index :admin_users, :reset_password_token, :unique => true
-    add_index :admin_users, :confirmation_token,   :unique => true
-    add_index :admin_users, :unlock_token,         :unique => true
-    # add_index :admin_users, :authentication_token, :unique => true
-  end
-
-  def self.down
-    drop_table :admin_users
-  end
-end
diff --git a/db/migrate/20111030164012_create_devise_admin_users.rb b/db/migrate/20111030164012_create_devise_admin_users.rb
index af89857..bb694f4 100644
--- a/db/migrate/20111030164012_create_devise_admin_users.rb
+++ b/db/migrate/20111030164012_create_devise_admin_users.rb
@@ -1,15 +1,34 @@
 class CreateDeviseAdminUsers < ActiveRecord::Migration
   def up
     create_table(:admin_users) do |t|
-      t.database_authenticatable :null => false
-      t.recoverable
-      t.rememberable
-      t.trackable
+      # Database authenticatable
+      t.string :email,              :null => false, :default => ""
+      t.string :encrypted_password, :null => false, :default => ""
 
-      # t.encryptable
-      t.confirmable
-      t.lockable :lock_strategy => :failed_attempts, :unlock_strategy => :both
-      # t.token_authenticatable
+      # Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+
+      # Rememberable
+      t.datetime :remember_created_at
+
+      # Trackable
+      t.integer  :sign_in_count, :default => 0
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string   :current_sign_in_ip
+      t.string   :last_sign_in_ip
+
+      # Confirmable
+      t.string   :confirmation_token
+      t.datetime :confirmed_at
+      t.datetime :confirmation_sent_at
+      t.string   :unconfirmed_email # Only if using reconfirmable
+
+      # Lockable
+      t.integer  :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
+      t.string   :unlock_token # Only if unlock strategy is :email or :both
+      t.datetime :locked_at
 
       t.timestamps
     end