diff --git a/core/client/app/controllers/setup/three.js b/core/client/app/controllers/setup/three.js
index 00510a51cc..9398970c1f 100644
--- a/core/client/app/controllers/setup/three.js
+++ b/core/client/app/controllers/setup/three.js
@@ -123,7 +123,7 @@ export default Ember.Controller.extend({
 
                             notifications.showAlert(successCount + ' ' + invitationsString + ' sent!', {type: 'success', delayed: true});
                             self.send('loadServerNotifications');
-                            self.transitionTo('posts.index');
+                            self.transitionToRoute('posts.index');
                         }
 
                         self.toggleProperty('submitting');
@@ -143,7 +143,7 @@ export default Ember.Controller.extend({
         },
         skipInvite: function () {
             this.send('loadServerNotifications');
-            this.transitionTo('posts.index');
+            this.transitionToRoute('posts.index');
         }
     }
 });
diff --git a/core/client/app/controllers/setup/two.js b/core/client/app/controllers/setup/two.js
index 4daa93da04..593c32b250 100644
--- a/core/client/app/controllers/setup/two.js
+++ b/core/client/app/controllers/setup/two.js
@@ -79,7 +79,6 @@ export default Ember.Controller.extend(ValidationEngine, {
                         identification: self.get('email'),
                         password: self.get('password')
                     }).then(function () {
-                        self.set('password', '');
                         self.set('blogCreated', true);
                         if (data.image) {
                             self.sendImage(result.users[0])
diff --git a/core/client/app/routes/setup.js b/core/client/app/routes/setup.js
index a1397f98ab..edba70ee7e 100644
--- a/core/client/app/routes/setup.js
+++ b/core/client/app/routes/setup.js
@@ -31,5 +31,9 @@ export default Ember.Route.extend(styleBody, {
                 return self.transitionTo('signin');
             }
         });
+    },
+    deactivate: function () {
+        this._super();
+        this.controllerFor('setup/two').set('password', '');
     }
 });