diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 2783f2ee82..81a2924fb7 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -305,9 +305,7 @@ module.exports = React.createClass({
                 break;
             case 'start_upgrade_registration':
                 // stash our guest creds so we can backout if needed
-                if (MatrixClientPeg.get().isGuest()) {
-                    this.guestCreds = MatrixClientPeg.getCredentials();
-                }
+                this.guestCreds = MatrixClientPeg.getCredentials();
                 this.replaceState({
                     screen: "register",
                     upgradeUsername: MatrixClientPeg.get().getUserIdLocalpart(),