diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index ef5f7e71b..242d90106 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -3209,6 +3209,11 @@ define([
                 }
             }
 
+            if (APP.loggedIn && path[0] === FILES_DATA) {
+                path = [ROOT];
+            }
+
+
             appStatus.ready(false);
             currentPath = path;
             var s = $content.scrollTop() || 0;
diff --git a/www/common/outer/messenger.js b/www/common/outer/messenger.js
index 43b313f3b..a7ef27837 100644
--- a/www/common/outer/messenger.js
+++ b/www/common/outer/messenger.js
@@ -891,10 +891,10 @@ define([
             onDirectMessage(ctx, msg, sender);
         });
         ctx.store.network.on('disconnect', function () {
-            ctx.emit('DISCONNECT', null, getAllClients());
+            ctx.emit('DISCONNECT', null, getAllClients(ctx));
         });
         ctx.store.network.on('reconnect', function () {
-            ctx.emit('RECONNECT', null, getAllClients());
+            ctx.emit('RECONNECT', null, getAllClients(ctx));
         });
 
         messenger.onFriendUpdate = function (curve) {
diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index 8243fb800..db150bf04 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -449,6 +449,15 @@ define([
                 return void cb({error: 'CHAT_INIT_ERROR'});
             };
             cpNf2 = CpNetflux.start(chatCfg);
+        }).nThen(function (waitFor) {
+            roster.metadata({
+                name: data.name
+            }, waitFor(function (err) {
+                if (err) {
+                    waitFor.abort();
+                    return void cb({error: 'ROSTER_INIT_ERROR'});
+                }
+            }));
         }).nThen(function () {
             var lm = Listmap.create(config);
             var proxy = lm.proxy;
@@ -486,6 +495,7 @@ define([
                 proxy.drive = {};
 
                 onReady(ctx, id, lm, roster, keys, cId, function () {
+                    ctx.updateMetadata();
                     cb();
                 });
             }).on('error', function (info) {