diff --git a/src/js/account-controller.js b/src/js/account-controller.js
index 654f4442e..0e01ab984 100644
--- a/src/js/account-controller.js
+++ b/src/js/account-controller.js
@@ -309,9 +309,11 @@ firebase.auth().onAuthStateChanged(function (user) {
     $(".pageLogin .preloader").addClass("hidden");
     $("#menu .icon-button.account .text").text(displayName);
 
-    try {
+    // try {
+    if (Tribe.state >= 1) {
       Tribe.setName(displayName);
-    } catch {}
+    }
+    // } catch {}
 
     // showFavouriteThemesAtTheTop();
     CommandlineLists.updateThemeCommands();
diff --git a/src/js/tribe/tribe.js b/src/js/tribe/tribe.js
index abc3644ab..3bd817f08 100644
--- a/src/js/tribe/tribe.js
+++ b/src/js/tribe/tribe.js
@@ -34,7 +34,7 @@ export let pageTransition = false;
 export let expectedVersion = "0.9.8";
 
 export let room = undefined;
-let name = undefined;
+export let name = undefined;
 let autoJoin = undefined;
 
 export function setAutoJoin(code) {