diff --git a/CHANGELOG b/CHANGELOG
index 3ef46f4484e3dcf11efbde4c0939721e29336946..fa8aba81a38486556215dfbf3d48a6a895ca9c3f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+v 6.9.0
+  - View active users in the admin dashboard
+
 v 6.8.0
   - Ability to at mention users that are participating in issue and merge req. discussion
   - Enabled GZip Compression for assets in example Nginx, make sure that Nginx is compiled with --with-http_gzip_static_module flag (this is default in Ubuntu)
diff --git a/db/migrate/20140416185734_index_on_current_sign_in_at.rb b/db/migrate/20140416185734_index_on_current_sign_in_at.rb
new file mode 100644
index 0000000000000000000000000000000000000000..0bf80ce154a151366967d45921bcebef5bcbe143
--- /dev/null
+++ b/db/migrate/20140416185734_index_on_current_sign_in_at.rb
@@ -0,0 +1,5 @@
+class IndexOnCurrentSignInAt < ActiveRecord::Migration
+  def change
+    add_index :users, :current_sign_in_at
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 265d556bd277a7a1f3fc916061b3666603589a88..0d3923b35c337a3d4806c67c5bc019bdc7fc49e4 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -332,6 +332,7 @@ ActiveRecord::Schema.define(version: 20140414131055) do
   add_index "users", ["admin"], name: "index_users_on_admin", using: :btree
   add_index "users", ["authentication_token"], name: "index_users_on_authentication_token", unique: true, using: :btree
   add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree
+  add_index "users", ["current_sign_in_at"], name: "index_users_on_current_sign_in_at", using: :btree
   add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
   add_index "users", ["extern_uid", "provider"], name: "index_users_on_extern_uid_and_provider", unique: true, using: :btree
   add_index "users", ["name"], name: "index_users_on_name", using: :btree