diff --git a/core/client/init.js b/core/client/init.js
index e6d11fb954..ca71dc0052 100644
--- a/core/client/init.js
+++ b/core/client/init.js
@@ -20,6 +20,8 @@
         router: null
     };
 
+    _.extend(Ghost, Backbone.Events);
+
     Ghost.init = function () {
         Ghost.router = new Ghost.Router();
 
diff --git a/core/client/router.js b/core/client/router.js
index ae0bdee0bf..b848b278e2 100644
--- a/core/client/router.js
+++ b/core/client/router.js
@@ -33,7 +33,10 @@
         },
 
         settings: function (pane) {
-            Ghost.currentView = new Ghost.Views.Settings({ el: '#main', pane: pane });
+            // only update the currentView if we don't already have a Settings view
+            if (!Ghost.currentView || !(Ghost.currentView instanceof Ghost.Views.Settings)) {
+                Ghost.currentView = new Ghost.Views.Settings({ el: '#main', pane: pane });
+            }
         },
 
         editor: function (id) {
diff --git a/core/client/views/base.js b/core/client/views/base.js
index c34ae87052..6b447d1bd6 100644
--- a/core/client/views/base.js
+++ b/core/client/views/base.js
@@ -153,7 +153,7 @@
         initialize: function () {
             var self = this;
             this.render();
-            Backbone.history.on('route', function () {
+            Ghost.on('urlchange', function () {
                 self.clearEverything();
             });
         },
diff --git a/core/client/views/settings.js b/core/client/views/settings.js
index 77f68c25f4..fdc426613c 100644
--- a/core/client/views/settings.js
+++ b/core/client/views/settings.js
@@ -43,7 +43,8 @@
             var self = this,
                 model;
 
-            Backbone.history.navigate('/settings/' + id, {trigger: true});
+            Ghost.router.navigate('/settings/' + id);
+            Ghost.trigger('urlchange');
             if (this.pane && id === this.pane.el.id) {
                 return;
             }
@@ -100,7 +101,6 @@
                 message: 'Saved',
                 status: 'passive'
             });
-
         },
         saveError: function (message) {
             message = message || 'Something went wrong, not saved :(';
diff --git a/core/test/functional/admin/05_settings_test.js b/core/test/functional/admin/05_settings_test.js
index 1993be94b2..4432e5a4b6 100644
--- a/core/test/functional/admin/05_settings_test.js
+++ b/core/test/functional/admin/05_settings_test.js
@@ -1,6 +1,6 @@
 /*globals casper, __utils__, url */
 
-casper.test.begin("Settings screen is correct", 12, function suite(test) {
+casper.test.begin("Settings screen is correct", 19, function suite(test) {
 
     casper.test.filename = "settings_test.png";
 
@@ -23,6 +23,7 @@ casper.test.begin("Settings screen is correct", 12, function suite(test) {
         }, "loaded content is general screen");
     });
 
+    // test the publishing / content tab
     casper.thenClick('.settings-menu .publishing', function then() {
         test.assertEval(function testGeneralIsNotActive() {
             return !document.querySelector('.settings-menu .general').classList.contains('active');
@@ -32,10 +33,84 @@ casper.test.begin("Settings screen is correct", 12, function suite(test) {
         }, "content tab is marked active");
         test.assertEval(function testContentIsContent() {
             return document.querySelector('.settings-content').id === 'content';
-        }, "loaded content is contentß screen");
+        }, "loaded content is content screen");
+    });
+
+    // test the user tab
+    casper.thenClick('.settings-menu .users', function then() {
+        test.assertEval(function testGeneralIsNotActive() {
+            return !document.querySelector('.settings-menu .general').classList.contains('active');
+        }, "general tab is not marked active");
+        test.assertEval(function testContentIsNotActive() {
+            return !document.querySelector('.settings-menu .publishing').classList.contains('active');
+        }, "content tab is marked active");
+        test.assertEval(function testUserIsActive() {
+            return document.querySelector('.settings-menu .users').classList.contains('active');
+        }, "user tab is marked active");
+        test.assertEval(function testContentIsUser() {
+            return document.querySelector('.settings-content').id === 'user';
+        }, "loaded content is user screen");
+    });
+
+    function handleUserRequest(requestData, request) {
+        // make sure we only get requests from the user pane
+        if (requestData.url.indexOf('settings/') !== -1) {
+            casper.test.fail("Saving the user pane triggered another settings pane to save");
+        }
+    }
+
+    function handleSettingsRequest(requestData, request) {
+        // make sure we only get requests from the user pane
+        if (requestData.url.indexOf('users/') !== -1) {
+            casper.test.fail("Saving a settings pane triggered the user pane to save");
+        }
+    }
+
+    casper.then(function listenForRequests() {
+        casper.on('resource.requested', handleUserRequest);
+    });
+
+    casper.thenClick('#user .button-save').waitFor(function successNotification() {
+        return this.evaluate(function () {
+            return document.querySelectorAll('.js-bb-notification section').length > 0;
+        });
+    }, function doneWaiting() {
+
+    }, function waitTimeout() {
+        casper.test.fail("Saving the user pane did not result in a notification");
+    });
+
+    casper.then(function checkUserWasSaved() {
+        casper.removeListener('resource.requested', handleUserRequest);
+        test.assertExists('.notification-success', 'got success notification');
+    });
+
+    casper.thenClick('#main-menu .settings a').then(function testOpeningSettingsTwice() {
+        casper.on('resource.requested', handleSettingsRequest);
+        test.assertEval(function testUserIsActive() {
+            return document.querySelector('.settings-menu .general').classList.contains('active');
+        }, "general tab is marked active");
+
+    });
+
+    casper.thenClick('#general .button-save').waitFor(function successNotification() {
+        return this.evaluate(function () {
+            return document.querySelectorAll('.js-bb-notification section').length > 0;
+        });
+    }, function doneWaiting() {
+
+    }, function waitTimeout() {
+        casper.test.fail("Saving the general pane did not result in a notification");
+    });
+
+    casper.then(function checkSettingsWereSaved() {
+        casper.removeListener('resource.requested', handleSettingsRequest);
+        test.assertExists('.notification-success', 'got success notification');
     });
 
     casper.run(function () {
+        casper.removeListener('resource.requested', handleUserRequest);
+        casper.removeListener('resource.requested', handleSettingsRequest);
         test.done();
     });
 });
\ No newline at end of file