diff --git a/db/migrate/20150616224717_add_base_indexes.rb b/db/migrate/20150616224717_add_base_indexes.rb
new file mode 100644
index 000000000..2727009d0
--- /dev/null
+++ b/db/migrate/20150616224717_add_base_indexes.rb
@@ -0,0 +1,12 @@
+class AddBaseIndexes < ActiveRecord::Migration
+  def change
+    add_index :users, [:organization_id]
+    add_index :roles_users, [:user_id]
+    add_index :roles_users, [:role_id]
+    add_index :groups_users, [:user_id]
+    add_index :groups_users, [:group_id]
+    add_index :organizations_users, [:user_id]
+    add_index :organizations_users, [:organization_id]
+
+  end
+end