diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index ae7d752b6..92c32cbb2 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -372,7 +372,7 @@ define([
         var metadata = {
             // "user" is shared with everybody via the userlist
             user: {
-                name: store.proxy[Constants.displayNameKey],
+                name: store.proxy[Constants.displayNameKey] || "",
                 uid: store.proxy.uid,
                 avatar: Util.find(store.proxy, ['profile', 'avatar']),
                 profile: Util.find(store.proxy, ['profile', 'view']),
diff --git a/www/common/toolbar3.js b/www/common/toolbar3.js
index 652047615..1fd87294d 100644
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@@ -885,7 +885,6 @@ define([
         var oldUserData;
         if (!config.metadataMgr) { return; }
         var metadataMgr = config.metadataMgr;
-        var userNetfluxId = metadataMgr.getNetfluxId();
         var notify = function(type, name, oldname) {
             // type : 1 (+1 user), 0 (rename existing user), -1 (-1 user)
             if (typeof name === "undefined") { return; }
@@ -929,6 +928,7 @@ define([
         metadataMgr.onChange(function () {
             var newdata = metadataMgr.getMetadata().users;
             var netfluxIds = Object.keys(newdata);
+            var userNetfluxId = metadataMgr.getNetfluxId();
             // Notify for disconnected users
             if (typeof oldUserData !== "undefined") {
                 for (var u in oldUserData) {