From 587a86441fad3f7172ae195b9367d2ef80713118 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 25 Jul 2016 16:20:03 +0100
Subject: [PATCH] This may as wel go in createclient

---
 src/MatrixClientPeg.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index 8d155143fc..b7feca60ef 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -71,7 +71,6 @@ class MatrixClientPeg {
             }
         }
         this._createClient(hs_url, is_url, user_id, access_token);
-        this.matrixClient.setGuest(Boolean(isGuest));
 
         if (localStorage) {
             try {
@@ -146,6 +145,8 @@ class MatrixClientPeg {
         // we're going to add eventlisteners for each matrix event tile, so the
         // potential number of event listeners is quite high.
         this.matrixClient.setMaxListeners(500);
+
+        this.matrixClient.setGuest(Boolean(isGuest));
     }
 }