From a44ebddae02183dbcd5144714bd9a86e870e9d8a Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 19 Mar 2016 02:45:06 +0000
Subject: [PATCH] show default displayname in ChangeDisplayName prompt

---
 src/components/views/settings/ChangeDisplayName.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/components/views/settings/ChangeDisplayName.js b/src/components/views/settings/ChangeDisplayName.js
index ed5eb3fa42..799a8b9634 100644
--- a/src/components/views/settings/ChangeDisplayName.js
+++ b/src/components/views/settings/ChangeDisplayName.js
@@ -43,8 +43,19 @@ module.exports = React.createClass({
         this.setState({busy: true});
         var self = this;
         cli.getProfileInfo(cli.credentials.userId).done(function(result) {
+
+            var displayname = result.displayname;
+            if (!displayname) {
+                if (MatrixClientPeg.get().isGuest()) {
+                    displayname = "Guest " + MatrixClientPeg.get().getUserIdLocalpart();
+                }
+                else {
+                    displayname = MatrixClientPeg.get().getUserIdLocalpart();
+                }
+            }
+
             self.setState({
-                displayName: result.displayname,
+                displayName: displayname,
                 busy: false
             });
         }, function(error) {