diff --git a/db/migrate/20160418144013_add_index_to_username.rb b/db/migrate/20160418144013_add_index_to_username.rb
new file mode 100644
index 000000000..191f24ac6
--- /dev/null
+++ b/db/migrate/20160418144013_add_index_to_username.rb
@@ -0,0 +1,5 @@
+class AddIndexToUsername < ActiveRecord::Migration
+  def change
+    add_index :users, :username
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 223a14d47..49f0011f2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -432,6 +432,7 @@ ActiveRecord::Schema.define(version: 20160418172919) do
   add_index "users", ["geozone_id"], name: "index_users_on_geozone_id", using: :btree
   add_index "users", ["hidden_at"], name: "index_users_on_hidden_at", using: :btree
   add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
+  add_index "users", ["username"], name: "index_users_on_username", using: :btree
 
   create_table "valuation_assignments", force: :cascade do |t|
     t.integer  "valuator_id"