diff --git a/core/client/app/routes/settings/users.js b/core/client/app/routes/settings/users.js
deleted file mode 100644
index d9a932e04c..0000000000
--- a/core/client/app/routes/settings/users.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import AuthenticatedRoute from 'ghost/routes/authenticated';
-
-var UsersRoute = AuthenticatedRoute.extend();
-
-export default UsersRoute;
diff --git a/core/client/app/routes/settings/users/index.js b/core/client/app/routes/settings/users/index.js
index d6142906e6..738d9056eb 100644
--- a/core/client/app/routes/settings/users/index.js
+++ b/core/client/app/routes/settings/users/index.js
@@ -47,6 +47,10 @@ UsersIndexRoute = AuthenticatedRoute.extend(styleBody, CurrentUserSettings, Pagi
         });
     },
 
+    renderTemplate: function () {
+        this.render('settings/users/index', {into: 'application'});
+    },
+
     actions: {
         reload: function () {
             this.refresh();
diff --git a/core/client/app/routes/settings/users/user.js b/core/client/app/routes/settings/users/user.js
index 00a0538a8d..4dbca6b700 100644
--- a/core/client/app/routes/settings/users/user.js
+++ b/core/client/app/routes/settings/users/user.js
@@ -49,6 +49,10 @@ var SettingsUserRoute = AuthenticatedRoute.extend(styleBody, CurrentUserSettings
         this._super();
     },
 
+    renderTemplate: function () {
+        this.render('settings/users/user', {into: 'application'});
+    },
+
     actions: {
         save: function () {
             this.get('controller').send('save');
diff --git a/core/client/app/templates/settings/users.hbs b/core/client/app/templates/settings/users.hbs
deleted file mode 100644
index 94d7715c74..0000000000
--- a/core/client/app/templates/settings/users.hbs
+++ /dev/null
@@ -1,6 +0,0 @@
-{{!
-    Yes, this is the template default,
-    but for some reason things break without it in this instance.
-    @TODO Find a better fix?
-}}
-{{outlet}}
diff --git a/core/client/app/templates/settings/users/index.hbs b/core/client/app/templates/settings/users/index.hbs
index a9e3d15a48..b7291055db 100644
--- a/core/client/app/templates/settings/users/index.hbs
+++ b/core/client/app/templates/settings/users/index.hbs
@@ -1,4 +1,3 @@
-{{#view "settings/users/users-list-view" class="users-list-wrapper js-users-list-view"}}
     <header class="view-header">
         <h1 class="view-title">Team</h1>
         <section class="view-actions">
@@ -67,5 +66,3 @@
     </section>
 
     </section>{{! .content settings-users }}
-
-{{/view}}
diff --git a/core/client/app/views/settings/users.js b/core/client/app/views/settings/users.js
deleted file mode 100644
index 93229c2da6..0000000000
--- a/core/client/app/views/settings/users.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import BaseView from 'ghost/views/settings/content-base';
-
-var SettingsUsersView = BaseView.extend();
-
-export default SettingsUsersView;
diff --git a/core/client/app/views/settings/users/index.js b/core/client/app/views/settings/users/index.js
new file mode 100644
index 0000000000..8e91210980
--- /dev/null
+++ b/core/client/app/views/settings/users/index.js
@@ -0,0 +1,5 @@
+import BaseView from 'ghost/views/settings/content-base';
+
+var SettingsUserIndexView = BaseView.extend();
+
+export default SettingsUserIndexView;
diff --git a/core/client/app/views/settings/users/user.js b/core/client/app/views/settings/users/user.js
index 377557e2d6..cf1f398de7 100644
--- a/core/client/app/views/settings/users/user.js
+++ b/core/client/app/views/settings/users/user.js
@@ -1,5 +1,6 @@
-import Ember from 'ember';
-var SettingsUserView = Ember.View.extend({
+import BaseView from 'ghost/views/settings/content-base';
+
+var SettingsUserView = BaseView.extend({
     currentUser: Ember.computed.alias('controller.session.user'),
 
     isNotOwnProfile: Ember.computed('controller.user.id', 'currentUser.id', function () {