diff --git a/db/migrate/20131022171709_add_index_to_user_nickname_and_email.rb b/db/migrate/20131022171709_add_index_to_user_nickname_and_email.rb
new file mode 100644
index 0000000..9427144
--- /dev/null
+++ b/db/migrate/20131022171709_add_index_to_user_nickname_and_email.rb
@@ -0,0 +1,6 @@
+class AddIndexToUserNicknameAndEmail < ActiveRecord::Migration
+  def change
+    add_index :users, :nickname
+    add_index :users, :email
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5592f5c..fabf143 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20131022165054) do
+ActiveRecord::Schema.define(version: 20131022171709) do
 
   create_table "asciicasts", force: true do |t|
     t.integer  "user_id"
@@ -97,6 +97,8 @@ ActiveRecord::Schema.define(version: 20131022165054) do
   end
 
   add_index "users", ["auth_token"], name: "index_users_on_auth_token", using: :btree
+  add_index "users", ["email"], name: "index_users_on_email", using: :btree
+  add_index "users", ["nickname"], name: "index_users_on_nickname", using: :btree
   add_index "users", ["provider", "uid"], name: "index_users_on_provider_and_uid", unique: true, using: :btree
 
 end