From e63a24a08a91cf4319b0b0b4036e3c7639c0fe4d Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 5 Mar 2015 16:14:27 -0500
Subject: [PATCH] FIX: Back button was a bit odd with default admin users list

---
 .../javascripts/admin/routes/admin-users-list-index.js.es6      | 2 +-
 app/assets/javascripts/admin/templates/admin.hbs                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/routes/admin-users-list-index.js.es6 b/app/assets/javascripts/admin/routes/admin-users-list-index.js.es6
index c989a677c18..09c09197d5d 100644
--- a/app/assets/javascripts/admin/routes/admin-users-list-index.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-users-list-index.js.es6
@@ -1,5 +1,5 @@
 export default Discourse.Route.extend({
-  redirect: function() {
+  beforeModel: function() {
     this.replaceWith('adminUsersList.show', 'active');
   }
 });
diff --git a/app/assets/javascripts/admin/templates/admin.hbs b/app/assets/javascripts/admin/templates/admin.hbs
index a651826c86c..df56d57bf8d 100644
--- a/app/assets/javascripts/admin/templates/admin.hbs
+++ b/app/assets/javascripts/admin/templates/admin.hbs
@@ -8,7 +8,7 @@
         {{#if currentUser.admin}}
           {{admin-nav-item route='adminSiteSettings' label='admin.site_settings.title'}}
         {{/if}}
-        {{admin-nav-item route='adminUsersList' label='admin.users.title'}}
+        {{admin-nav-item route='adminUsersList.show' routeParam='active' label='admin.users.title'}}
         {{#if showBadges}}
           {{admin-nav-item route='adminBadges.index' label='admin.badges.title'}}
         {{/if}}