diff --git a/src/scripts/librarymenu.js b/src/scripts/librarymenu.js
index 79c4c09e78..9da7988826 100644
--- a/src/scripts/librarymenu.js
+++ b/src/scripts/librarymenu.js
@@ -910,12 +910,16 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
     renderHeader();
 
     events.on(connectionManager, "localusersignedin", function (e, user) {
+        var currentApiClient = connectionManager.getApiClient(user.ServerId);
+
         currentDrawerType = null;
         currentUser = {
             localUser: user
         };
+
         loadNavDrawer();
-        connectionManager.user(connectionManager.getApiClient(user.ServerId)).then(function (user) {
+
+        connectionManager.user(currentApiClient).then(function (user) {
             currentUser = user;
             updateUserInHeader(user);
         });