diff --git a/ghost/admin/routes/setup.js b/ghost/admin/routes/setup.js
index 849c39b157..bebcdfefa4 100644
--- a/ghost/admin/routes/setup.js
+++ b/ghost/admin/routes/setup.js
@@ -2,7 +2,12 @@ import styleBody from 'ghost/mixins/style-body';
 import loadingIndicator from 'ghost/mixins/loading-indicator';
 
 var SetupRoute = Ember.Route.extend(styleBody, loadingIndicator, {
-    classNames: ['ghost-setup']
+    classNames: ['ghost-setup'],
+    beforeModel: function () {
+        if (this.get('session').isAuthenticated) {
+            this.transitionTo(Ember.SimpleAuth.routeAfterAuthentication);
+        }
+    }
 });
 
 export default SetupRoute;