diff --git a/src/components/playback/playerSelectionMenu.js b/src/components/playback/playerSelectionMenu.js
index dcf36dd9b4..0afa56faf4 100644
--- a/src/components/playback/playerSelectionMenu.js
+++ b/src/components/playback/playerSelectionMenu.js
@@ -220,18 +220,16 @@ function showActivePlayerMenuInternal(dialogHelper, playerInfo) {
         html += '</label>';
     }
 
-    html += '</div><div>';
+    html += '</div>';
 
     if (autocast.supported()) {
-        html += '<label class="checkboxContainer">';
+        html += '<div><label class="checkboxContainer">';
         var checkedHtmlAC = autocast.isEnabled() ? ' checked' : '';
         html += '<input type="checkbox" is="emby-checkbox" class="chkAutoCast"' + checkedHtmlAC + '/>';
         html += '<span>' + globalize.translate('EnableAutoCast') + '</span>';
-        html += '</label>';
+        html += '</label></div>';
     }
 
-    html += '</div>';
-
     html += '<div style="margin-top:1em;display:flex;justify-content: flex-end;">';
 
     html += '<button is="emby-button" type="button" class="button-flat btnRemoteControl promptDialogButton">' + globalize.translate('HeaderRemoteControl') + '</button>';
diff --git a/src/scripts/autocast.js b/src/scripts/autocast.js
index 4d191a62da..84e07b32cd 100644
--- a/src/scripts/autocast.js
+++ b/src/scripts/autocast.js
@@ -11,7 +11,7 @@ export function enable(enabled) {
     if (enabled) {
         const currentPlayerInfo = playbackManager.getPlayerInfo();
 
-        if (currentPlayerInfo && currentPlayerInfo.id && currentPlayerInfo.id) {
+        if (currentPlayerInfo && currentPlayerInfo.id) {
             localStorage.setItem('autocastPlayerId', currentPlayerInfo.id);
         }
     } else {
@@ -29,8 +29,6 @@ export function isEnabled() {
 }
 
 function onOpen() {
-    if (!supported()) return;
-
     const playerId = localStorage.getItem('autocastPlayerId');
 
     playbackManager.getTargets().then(function (targets) {
@@ -44,6 +42,6 @@ function onOpen() {
 }
 
 const apiClient = window.connectionManager.currentApiClient();
-if (apiClient) {
+if (apiClient && supported()) {
     events.on(apiClient, 'websocketopen', onOpen);
 }
diff --git a/src/scripts/libraryMenu.js b/src/scripts/libraryMenu.js
index 7a332a853c..680143ccf1 100644
--- a/src/scripts/libraryMenu.js
+++ b/src/scripts/libraryMenu.js
@@ -911,12 +911,6 @@ import 'flexStyles';
         }
     }
 
-    function ensureHeader() {
-        return new Promise(function (resolve) {
-            window.connectionManager.user(getCurrentApiClient()).then(updateUserInHeader).then(resolve);
-        });
-    }
-
     let currentPageType;
     pageClassOn('pagebeforeshow', 'page', function (e) {
         if (!this.classList.contains('withTabs')) {