diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index a6f2ee820f..6d827b3ef0 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -805,6 +805,12 @@ module.exports = React.createClass({
             dis.dispatch({action: 'view_home_page'});
         } else if (this._is_registered) {
             this._is_registered = false;
+
+            // Set the display name = entered username
+            MatrixClientPeg.get().setDisplayName(
+                MatrixClientPeg.get().getUserIdLocalpart()
+            );
+
             if (this.props.config.welcomeUserId) {
                 createRoom({
                     dmUserId: this.props.config.welcomeUserId,