diff --git a/www/common/toolbar2.js b/www/common/toolbar2.js
index cdc571bfe..225f18fd2 100644
--- a/www/common/toolbar2.js
+++ b/www/common/toolbar2.js
@@ -838,7 +838,6 @@ define([
                             console.error(err);
                             return;
                         }
-                        updateDisplayName(toolbar, config);
                         Cryptpad.changeDisplayName(newName, true);
                     });
                 });
@@ -846,6 +845,7 @@ define([
         });
         Cryptpad.onDisplayNameChanged(function () {
             Cryptpad.findCancelButton().click();
+            updateDisplayName(toolbar, config);
         });
 
         updateDisplayName(toolbar, config);
diff --git a/www/file/main.js b/www/file/main.js
index 71e18fbb8..11ec94650 100644
--- a/www/file/main.js
+++ b/www/file/main.js
@@ -67,7 +67,7 @@ define([
             displayed: displayed,
             ifrw: ifrw,
             common: Cryptpad,
-            hideDisplayName: true,
+            //hideDisplayName: true,
             $container: $bar,
         };
 
diff --git a/www/settings/main.js b/www/settings/main.js
index 761c13bc2..afe588258 100644
--- a/www/settings/main.js
+++ b/www/settings/main.js
@@ -101,6 +101,7 @@ define([
             displayName = $input.val();
             if (displayName === obj[USERNAME_KEY]) { return; }
             obj[USERNAME_KEY] = displayName;
+            Cryptpad.changeDisplayName(displayName);
             $spinner.show();
             Cryptpad.whenRealtimeSyncs(store.info.realtime, function () {
                 $spinner.hide();
@@ -365,7 +366,6 @@ define([
             displayed: displayed,
             ifrw: window,
             common: Cryptpad,
-            hideDisplayName: true,
             $container: APP.$toolbar,
             pageTitle: Messages.settings_title
         };
@@ -395,6 +395,7 @@ define([
 
         obj.proxy.on('change', [], refresh);
         obj.proxy.on('remove', [], refresh);
+        Cryptpad.onDisplayNameChanged(refresh);
 
         createLeftside();
         createUsageButton();