diff --git a/customize.dist/fsStore.js b/customize.dist/fsStore.js
index 56c4a6977..1ab788dc4 100644
--- a/customize.dist/fsStore.js
+++ b/customize.dist/fsStore.js
@@ -158,6 +158,18 @@ define([
             logLevel: 1,
         };
 
+        window.addEventListener('storage', function (e) {
+            var key = e.key;
+            if (e.key !== Cryptpad.userHashKey) { return; }
+            var o = e.oldValue;
+            var n = e.newValue;
+            if (!o && n) {
+                window.location.reload();
+            } else if (o && !n) {
+                window.location.reload();
+            }
+        });
+
         var rt = window.rt = Listmap.create(listmapConfig);
         exp.proxy = rt.proxy;
         rt.proxy.on('create', function (info) {
diff --git a/customize.dist/src/less/toolbar.less b/customize.dist/src/less/toolbar.less
index 7e78bfe8d..49927787a 100644
--- a/customize.dist/src/less/toolbar.less
+++ b/customize.dist/src/less/toolbar.less
@@ -289,19 +289,33 @@
     font-weight: bold;
     text-transform: uppercase;
 }
-        .fa-user {
-            margin-right: 5px;
-        }
 .cryptpad-user {
+    p.accountData {
+        background: #f0f0f0;
+        &> span {
+            font-weight: bold;
+            span {
+                font-weight: normal;
+            }
+        }
+    }
     .buttonTitle {
         .fa-user {
             margin-right: 5px;
         }
-        .cryptpad-toolbar-username {
+        .account-name {
+            margin-left: 5px;
+        }
+    }
+}
+.cryptpad-dropdown-share {
+    a {
+        .fa {
             margin-right: 5px;
         }
     }
 }
+
 .lag {
     height: 15px !important;
     width: 15px !important;
diff --git a/customize.dist/toolbar.css b/customize.dist/toolbar.css
index 2e9501266..86422fea8 100644
--- a/customize.dist/toolbar.css
+++ b/customize.dist/toolbar.css
@@ -361,13 +361,22 @@
   font-weight: bold;
   text-transform: uppercase;
 }
-.fa-user {
-  margin-right: 5px;
+.cryptpad-user p.accountData {
+  background: #f0f0f0;
+}
+.cryptpad-user p.accountData > span {
+  font-weight: bold;
+}
+.cryptpad-user p.accountData > span span {
+  font-weight: normal;
 }
 .cryptpad-user .buttonTitle .fa-user {
   margin-right: 5px;
 }
-.cryptpad-user .buttonTitle .cryptpad-toolbar-username {
+.cryptpad-user .buttonTitle .account-name {
+  margin-left: 5px;
+}
+.cryptpad-dropdown-share a .fa {
   margin-right: 5px;
 }
 .lag {
diff --git a/www/code/main.js b/www/code/main.js
index 3ee72e285..348fc2ceb 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -397,6 +397,7 @@ define([
                 var $userBlock = $bar.find('.' + Toolbar.constants.username);
                 var $editShare = $bar.find('.' + Toolbar.constants.editShare);
                 var $viewShare = $bar.find('.' + Toolbar.constants.viewShare);
+                var $usernameButton = module.$userNameButton = $($bar.find('.' + Toolbar.constants.changeUsername));
 
                 var editHash;
                 var viewHash = Cryptpad.getViewHashFromKeys(info.channel, secret.keys);
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index a3ce2f85e..ada2534aa 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -227,9 +227,8 @@ define([
             $editUsers.html('').append($usersTitle).append(editUsersList);
 
             // Update the buttons
-            var fa_caretdown = '<span class="fa fa-caret-down" style="font-family:FontAwesome;"></span>';
-            var fa_editusers = '<span class="fa fa-users" style="font-family:FontAwesome;"></span>';
-            var fa_viewusers = '<span class="fa fa-eye" style="font-family:FontAwesome;"></span>';
+            var fa_editusers = '<span class="fa fa-users"></span>';
+            var fa_viewusers = '<span class="fa fa-eye"></span>';
             var viewersText = numberOfViewUsers > 1 ? Messages.viewers : Messages.viewer;
             var editorsText = numberOfEditUsers > 1 ? Messages.editors : Messages.editor;
             var $span = $('<span>', {'class': 'large'}).html(fa_editusers + ' ' + numberOfEditUsers + ' ' + editorsText + '&nbsp;&nbsp; ' + fa_viewusers + ' ' + numberOfViewUsers + ' ' + viewersText);
@@ -326,7 +325,7 @@ define([
         $linkContainer.append($aTagSmall).append($aTagBig);
     };
 
-    var createUserAdmin = function ($topContainer, config, lagElement, Cryptpad) {
+    var createUserAdmin = function ($topContainer, config, readOnly, lagElement, Cryptpad) {
         if (config.displayed.indexOf('useradmin') === -1 && config.displayed.indexOf('share') === -1) { return; }
         var $lag = $(lagElement);
         //TODO check if we should displayed that button and if we can (userName.setName, userName.lastName and userdata required)
@@ -365,16 +364,27 @@ define([
                 $userAdminContent.append($userAccount);
                 $userAdminContent.append($('<br>'));
             }
-            var $userName = $('<span>', {'class': 'userDisplayName'}).append(Messages.user_displayName + ': ').append($displayedName.clone());
+            var $userName = $('<span>', {'class': 'userDisplayName'});
+            if (readOnly !== 1) {
+                // Hide "Display name:" in read only mode
+                $userName.append(Messages.user_displayName + ': ')
+            }
+            $userName.append($displayedName.clone());
             $userAdminContent.append($userName);
             var options = [{
                 tag: 'p',
+                attributes: {'class': 'accountData'},
                 content: $userAdminContent.html()
-            }, {
-                tag: 'a',
-                attributes: {'class': USERBUTTON_CLS},
-                content: Messages.user_rename
             }];
+            // Add the change display name button if not in read only mode
+            if (readOnly !== 1) {
+                options.push({
+                    tag: 'a',
+                    attributes: {'class': USERBUTTON_CLS},
+                    content: Messages.user_rename
+                });
+            }
+            // Add login or logout button depending on the current status
             if (account) {
                 options.push({
                     tag: 'a',
@@ -391,7 +401,7 @@ define([
             var $icon = $('<span>', {'class': 'fa fa-user'});
             var $button = $('<div>').append($icon).append($displayedName.clone());
             if (account) {
-                $button.append('(' + accountName + ')');
+                $button.append($('<span>', {'class': 'account-name'}).text('(' + accountName + ')'));
             }
             var dropdownConfig = {
                 text: $button.html(), // Button initial text
@@ -406,7 +416,7 @@ define([
                 window.location.reload();
             });
             $userAdmin.find('a.login').click(function (e) {
-                window.open = '/user';
+                window.open('/user');
             });
 
             if (config.userName && config.userName.setName && config.userName.lastName) {
@@ -510,7 +520,7 @@ define([
         var $titleElement = createTitle(toolbar.find('.' + TOP_CLS), readOnly, config.title, Cryptpad);
         var $linkElement = createLinkToMain(toolbar.find('.' + TOP_CLS));
         var lagElement = createLagElement();
-        var $userAdminElement = createUserAdmin(toolbar.find('.' + TOP_CLS), config, lagElement, Cryptpad);
+        var $userAdminElement = createUserAdmin(toolbar.find('.' + TOP_CLS), config, readOnly, lagElement, Cryptpad);
         var spinner = createSpinner($userAdminElement, config);
         var userData = config.userData;
         // readOnly = 1 (readOnly enabled), 0 (disabled), -1 (old pad without readOnly mode)
diff --git a/www/drive/main.js b/www/drive/main.js
index e0c93e097..308beed83 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -158,7 +158,7 @@ define([
         if (!APP.readOnly) {
             getLastName(function (err, lastName) {
                 APP.userName.lastName = lastName;
-                APP.$displayName.text(lastName);
+                APP.$displayName.text(lastName || Messages.anonymous);
             });
         } else {
             APP.$displayName.html('<span class="' + Toolbar.constants.readonly + '">' + Messages.readonly + '</span>');
diff --git a/www/pad/main.js b/www/pad/main.js
index 7930e659f..e0a7bc4f8 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -590,7 +590,7 @@ define([
                 var $userBlock = $bar.find('.' + Toolbar.constants.username);
                 var $editShare = $bar.find('.' + Toolbar.constants.editShare);
                 var $viewShare = $bar.find('.' + Toolbar.constants.viewShare);
-                var $usernameButton = module.$userNameButton = $bar.find('.' + Toolbar.constants.changeUsername);
+                var $usernameButton = module.$userNameButton = $($bar.find('.' + Toolbar.constants.changeUsername));
 
                 var editHash;
                 var viewHash = Cryptpad.getViewHashFromKeys(info.channel, secret.keys);
diff --git a/www/poll/main.js b/www/poll/main.js
index 64b53e350..ab696ecb5 100644
--- a/www/poll/main.js
+++ b/www/poll/main.js
@@ -674,6 +674,7 @@ define([
         var $userBlock = $bar.find('.' + Toolbar.constants.username);
         var $editShare = $bar.find('.' + Toolbar.constants.editShare);
         var $viewShare = $bar.find('.' + Toolbar.constants.viewShare);
+        var $usernameButton = APP.$userNameButton = $($bar.find('.' + Toolbar.constants.changeUsername));
 
         /* add a forget button */
         var forgetCb = function (err, title) {
diff --git a/www/slide/main.js b/www/slide/main.js
index 729d54921..4becaa0f0 100644
--- a/www/slide/main.js
+++ b/www/slide/main.js
@@ -440,6 +440,7 @@ define([
                 var $userBlock = $bar.find('.' + Toolbar.constants.username);
                 var $editShare = $bar.find('.' + Toolbar.constants.editShare);
                 var $viewShare = $bar.find('.' + Toolbar.constants.viewShare);
+                var $usernameButton = module.$userNameButton = $($bar.find('.' + Toolbar.constants.changeUsername));
 
                 var editHash;
                 var viewHash = Cryptpad.getViewHashFromKeys(info.channel, secret.keys);