diff --git a/src/components/navdrawer/navdrawer.js b/src/components/navdrawer/navdrawer.js
index 3a1119e129..cbf5c1eebc 100644
--- a/src/components/navdrawer/navdrawer.js
+++ b/src/components/navdrawer/navdrawer.js
@@ -2,19 +2,22 @@ define(["browser", "dom", "css!./navdrawer", "scrollStyles"], function(browser,
     "use strict";
     return function(options) {
         function getTouches(e) {
-            return e.changedTouches || e.targetTouches || e.touches
+            return e.changedTouches || e.targetTouches || e.touches;
         }
 
         function onMenuTouchStart(e) {
             options.target.classList.remove("transition");
-            var touches = getTouches(e),
-                touch = touches[0] || {};
-            menuTouchStartX = touch.clientX, menuTouchStartY = touch.clientY, menuTouchStartTime = (new Date).getTime()
+            var touches = getTouches(e);
+            var touch = touches[0] || {};
+
+            menuTouchStartX = touch.clientX;
+            menuTouchStartY = touch.clientY;
+            menuTouchStartTime = (new Date).getTime();
         }
 
         function setVelocity(deltaX) {
             var time = (new Date).getTime() - (menuTouchStartTime || 0);
-            velocity = Math.abs(deltaX) / time
+            velocity = Math.abs(deltaX) / time;
         }
 
         function onMenuTouchMove(e) {
@@ -29,25 +32,41 @@ define(["browser", "dom", "css!./navdrawer", "scrollStyles"], function(browser,
         }
 
         function onMenuTouchEnd(e) {
-            options.target.classList.add("transition"), scrollContainer.removeEventListener("scroll", disableEvent), dragMode = 0;
+            options.target.classList.add("transition");
+            scrollContainer.removeEventListener("scroll", disableEvent);
+            dragMode = 0;
+
             var touches = getTouches(e),
                 touch = touches[0] || {},
                 endX = touch.clientX || 0,
                 endY = touch.clientY || 0,
                 deltaX = endX - (menuTouchStartX || 0),
                 deltaY = endY - (menuTouchStartY || 0);
-            currentPos = deltaX, self.checkMenuState(deltaX, deltaY)
+
+            currentPos = deltaX;
+            self.checkMenuState(deltaX, deltaY);
         }
 
         function onEdgeTouchStart(e) {
-            if (isPeeking) onMenuTouchMove(e);
-            else {
-                ((getTouches(e)[0] || {}).clientX || 0) <= options.handleSize && (isPeeking = !0, "touchstart" === e.type && (dom.removeEventListener(edgeContainer, "touchmove", onEdgeTouchMove, {}), dom.addEventListener(edgeContainer, "touchmove", onEdgeTouchMove, {})), onMenuTouchStart(e))
+            if (isPeeking) {
+                onMenuTouchMove(e);
+            } else {
+                if (((getTouches(e)[0] || {}).clientX || 0) <= options.handleSize) {
+                    isPeeking = true;
+                    if (e.type === "touchstart") {
+                        dom.removeEventListener(edgeContainer, "touchmove", onEdgeTouchMove, {});
+                        dom.addEventListener(edgeContainer, "touchmove", onEdgeTouchMove, {});
+                    }
+                    onMenuTouchStart(e);
+                }
             }
         }
 
         function onEdgeTouchMove(e) {
-            onEdgeTouchStart(e), e.preventDefault(), e.stopPropagation()
+            e.preventDefault();
+            e.stopPropagation();
+
+            onEdgeTouchStart(e);
         }
 
         function onEdgeTouchEnd(e) {
diff --git a/src/scripts/librarymenu.js b/src/scripts/librarymenu.js
index d89cc11038..6fc4cfd886 100644
--- a/src/scripts/librarymenu.js
+++ b/src/scripts/librarymenu.js
@@ -117,7 +117,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
             html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder" data-itemid="selectserver" href="selectserver.html?showuser=1"><i class="md-icon navMenuOptionIcon">&#xE308;</i><span class="navMenuOptionText">' + globalize.translate("ButtonSelectServer") + "</span></a>";
         }
         // null check for local user might not be required
-        if (user.localUser && user.localUser.EnableAutoLogin) {
+        if (user.localUser && !user.localUser.EnableAutoLogin) {
             html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder btnLogout" data-itemid="logout" href="#"><i class="md-icon navMenuOptionIcon">&#xE879;</i><span class="navMenuOptionText">' + globalize.translate("ButtonSignOut") + "</span></a>";
         }
         html += "</div>";