diff --git a/bower.json b/bower.json
index a8a3202dca..4805b98192 100644
--- a/bower.json
+++ b/bower.json
@@ -8,7 +8,7 @@
     "ember-data": "1.0.0-beta.11",
     "ember-load-initializers": "git://github.com/stefanpenner/ember-load-initializers.git#0.0.1",
     "ember-resolver": "git://github.com/stefanpenner/ember-jj-abrams-resolver.git#181251821cf513bb58d3e192faa13245a816f75e",
-    "ember-simple-auth": "0.6.6",
+    "ember-simple-auth": "0.7.2",
     "fastclick": "1.0.0",
     "handlebars": "1.3.0",
     "ic-ajax": "1.0.1",
diff --git a/core/client/initializers/authentication.js b/core/client/initializers/authentication.js
index d816e8cebc..9861cb4e5c 100644
--- a/core/client/initializers/authentication.js
+++ b/core/client/initializers/authentication.js
@@ -16,7 +16,14 @@ AuthenticationInitializer = {
         window.ENV['simple-auth'] = {
             authenticationRoute: 'signin',
             routeAfterAuthentication: 'content',
-            authorizer: 'simple-auth-authorizer:oauth2-bearer'
+            authorizer: 'simple-auth-authorizer:oauth2-bearer',
+            localStorageKey: 'ghost' + (Ghost.subdir.indexOf('/') === 0 ? '-' + Ghost.subdir.substr(1) : '') + ':session'
+        };
+
+        window.ENV['simple-auth-oauth2'] = {
+            serverTokenEndpoint: Ghost.apiRoot + '/authentication/token',
+            serverTokenRevocationEndpoint: Ghost.apiRoot + '/authentication/revoke',
+            refreshAccessTokens: true
         };
 
         SimpleAuth.Session.reopen({
@@ -26,18 +33,11 @@ AuthenticationInitializer = {
         });
 
         SimpleAuth.Authenticators.OAuth2.reopen({
-            serverTokenEndpoint: Ghost.apiRoot + '/authentication/token',
-            serverTokenRevocationEndpoint: Ghost.apiRoot + '/authentication/revoke',
-            refreshAccessTokens: true,
             makeRequest: function (url, data) {
                 data.client_id = 'ghost-admin';
                 return this._super(url, data);
             }
         });
-
-        SimpleAuth.Stores.LocalStorage.reopen({
-            key: 'ghost' + (Ghost.subdir.indexOf('/') === 0 ? '-' + Ghost.subdir.substr(1) : '') + ':session'
-        });
     }
 };