diff --git a/src/scripts/addpluginpage.js b/src/scripts/addpluginpage.js
index 9c111f1d84..6ad5b05d3f 100644
--- a/src/scripts/addpluginpage.js
+++ b/src/scripts/addpluginpage.js
@@ -44,10 +44,19 @@ define(["jQuery", "loading", "libraryMenu", "globalize", "connectionManager", "e
             var msg = globalize.translate("MessageInstallPluginFromApp");
             $("#nonServerMsg", page).html(msg).show();
         }
-        pkg.shortDescription ? $("#tagline", page).show().html(pkg.shortDescription) : $("#tagline", page).hide();
+        if (pkg.shortDescription) {
+            $("#tagline", page).show().html(pkg.shortDescription);
+        } else {
+            $("#tagline", page).hide();
+        }
         $("#overview", page).html(pkg.overview || "");
         $("#developer", page).html(pkg.owner);
-        pkg.richDescUrl ? ($("#pViewWebsite", page).show(), $("#pViewWebsite a", page).attr("href", pkg.richDescUrl)) : $("#pViewWebsite", page).hide();
+        if (pkg.richDescUrl) {
+            $("#pViewWebsite", page).show();
+            $("#pViewWebsite a", page).attr("href", pkg.richDescUrl);
+        } else {
+            $("#pViewWebsite", page).hide();
+        }
         if (pkg.previewImage || pkg.thumbImage) {
             var img = pkg.previewImage ? pkg.previewImage : pkg.thumbImage;
             $("#pPreviewImage", page).show().html("<img class='pluginPreviewImg' src='" + img + "' style='max-width: 100%;' />");
@@ -128,4 +137,4 @@ define(["jQuery", "loading", "libraryMenu", "globalize", "connectionManager", "e
             })
         })
     }
-});
\ No newline at end of file
+});
diff --git a/src/scripts/librarymenu.js b/src/scripts/librarymenu.js
index f4d428bb2d..18fafa8bf6 100644
--- a/src/scripts/librarymenu.js
+++ b/src/scripts/librarymenu.js
@@ -199,7 +199,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
         if (user.localUser) {
             html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder lnkMySettings" href="mypreferencesmenu.html"><i class="md-icon navMenuOptionIcon">settings</i><span class="navMenuOptionText">' + globalize.translate("ButtonSettings") + "</span></a>";
             html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder" data-itemid="selectserver" href="selectserver.html?showuser=1"><i class="md-icon navMenuOptionIcon">wifi</i><span class="navMenuOptionText">' + globalize.translate("ButtonSelectServer") + "</span></a>";
-            if (!localUser.EnableAutoLogin) {
+            if (!user.localUser.EnableAutoLogin) {
                 html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder btnLogout" data-itemid="logout" href="#"><i class="md-icon navMenuOptionIcon">exit_to_app</i><span class="navMenuOptionText">' + globalize.translate("ButtonSignOut") + "</span></a>";
             }
         }