diff --git a/src/components/appRouter.js b/src/components/appRouter.js
index c14434180d8a..34a8081a3e8d 100644
--- a/src/components/appRouter.js
+++ b/src/components/appRouter.js
@@ -1,5 +1,4 @@
 import { appHost } from './apphost';
-import appSettings from '../scripts/settings/appSettings';
 import backdrop from './backdrop/backdrop';
 import browser from '../scripts/browser';
 import { Events } from 'jellyfin-apiclient';
@@ -98,9 +97,7 @@ class AppRouter {
     beginConnectionWizard() {
         backdrop.clearBackdrop();
         loading.show();
-        ServerConnections.connect({
-            enableAutoLogin: appSettings.enableAutoLogin()
-        }).then((result) => {
+        ServerConnections.connect().then((result) => {
             this.handleConnectionResult(result);
         });
     }
@@ -162,9 +159,7 @@ class AppRouter {
         Events.on(appHost, 'beforeexit', this.onBeforeExit);
         Events.on(appHost, 'resume', this.onAppResume);
 
-        ServerConnections.connect({
-            enableAutoLogin: appSettings.enableAutoLogin()
-        }).then((result) => {
+        ServerConnections.connect().then((result) => {
             this.firstConnectionResult = result;
             options = options || {};
             page({
diff --git a/src/controllers/session/addServer/index.js b/src/controllers/session/addServer/index.js
index aabfdbcca8ba..6d837860ac97 100644
--- a/src/controllers/session/addServer/index.js
+++ b/src/controllers/session/addServer/index.js
@@ -1,4 +1,3 @@
-import appSettings from '../../../scripts/settings/appSettings';
 import loading from '../../../components/loading/loading';
 import globalize from '../../../scripts/globalize';
 import '../../../elements/emby-button/emby-button';
@@ -38,9 +37,7 @@ import ServerConnections from '../../../components/ServerConnections';
     function submitServer(page) {
         loading.show();
         const host = page.querySelector('#txtServerHost').value;
-        ServerConnections.connectToAddress(host, {
-            enableAutoLogin: appSettings.enableAutoLogin()
-        }).then(function(result) {
+        ServerConnections.connectToAddress(host).then(function(result) {
             handleConnectionResult(page, result);
         }, function() {
             handleConnectionResult(page, {
diff --git a/src/controllers/session/login/index.html b/src/controllers/session/login/index.html
index 0c9eb14f18ab..21daaf439886 100644
--- a/src/controllers/session/login/index.html
+++ b/src/controllers/session/login/index.html
@@ -13,7 +13,7 @@ <h1 class="sectionTitle">${HeaderPleaseSignIn}</h1>
             </div>
 
             <label class="checkboxContainer">
-                <input is="emby-checkbox" type="checkbox" class="chkRememberLogin" checked />
+                <input is="emby-checkbox" type="checkbox" class="chkRememberLogin" />
                 <span>${RememberMe}</span>
             </label>
 
diff --git a/src/controllers/session/login/index.js b/src/controllers/session/login/index.js
index 84596ce4c67b..725a5758595f 100644
--- a/src/controllers/session/login/index.js
+++ b/src/controllers/session/login/index.js
@@ -1,5 +1,4 @@
 import { appHost } from '../../../components/apphost';
-import appSettings from '../../../scripts/settings/appSettings';
 import dom from '../../../scripts/dom';
 import loading from '../../../components/loading/loading';
 import layoutManager from '../../../components/layoutManager';
@@ -19,9 +18,9 @@ import cardBuilder from '../../../components/cardbuilder/cardBuilder';
 
     const enableFocusTransform = !browser.slow && !browser.edge;
 
-    function authenticateUserByName(page, apiClient, username, password) {
+    function authenticateUserByName(page, apiClient, username, password, rememberMe) {
         loading.show();
-        apiClient.authenticateUserByName(username, password).then(function (result) {
+        apiClient.authenticateUserByName(username, password, rememberMe).then(function (result) {
             const user = result.User;
             loading.hide();
 
@@ -76,7 +75,8 @@ import cardBuilder from '../../../components/cardbuilder/cardBuilder';
                         dialogHelper.close(dlg);
                     }
 
-                    const result = await apiClient.quickConnect(data.Authentication);
+                    // FIXME: Save token for now. 'Remember Me' for Quick Connect?
+                    const result = await apiClient.quickConnect(data.Authentication, true);
                     onLoginSuccessful(result.User.Id, result.AccessToken, apiClient);
                 }, function (e) {
                     clearInterval(interval);
@@ -114,7 +114,6 @@ import cardBuilder from '../../../components/cardbuilder/cardBuilder';
     }
 
     function showManualForm(context, showCancel, focusPassword) {
-        context.querySelector('.chkRememberLogin').checked = appSettings.enableAutoLogin();
         context.querySelector('.manualLoginForm').classList.remove('hide');
         context.querySelector('.visualLoginForm').classList.add('hide');
         context.querySelector('.btnManual').classList.add('hide');
@@ -218,7 +217,7 @@ import cardBuilder from '../../../components/cardbuilder/cardBuilder';
                     context.querySelector('#txtManualName').value = '';
                     showManualForm(context, true);
                 } else if (haspw == 'false') {
-                    authenticateUserByName(context, getApiClient(), name, '');
+                    authenticateUserByName(context, getApiClient(), name, '', false);
                 } else {
                     context.querySelector('#txtManualName').value = name;
                     context.querySelector('#txtManualPassword').value = '';
@@ -227,9 +226,8 @@ import cardBuilder from '../../../components/cardbuilder/cardBuilder';
             }
         });
         view.querySelector('.manualLoginForm').addEventListener('submit', function (e) {
-            appSettings.enableAutoLogin(view.querySelector('.chkRememberLogin').checked);
             const apiClient = getApiClient();
-            authenticateUserByName(view, apiClient, view.querySelector('#txtManualName').value, view.querySelector('#txtManualPassword').value);
+            authenticateUserByName(view, apiClient, view.querySelector('#txtManualName').value, view.querySelector('#txtManualPassword').value, view.querySelector('.chkRememberLogin').checked);
             e.preventDefault();
             return false;
         });
diff --git a/src/controllers/session/selectServer/index.js b/src/controllers/session/selectServer/index.js
index 6c6e4189a5a2..1d45ef3e1be8 100644
--- a/src/controllers/session/selectServer/index.js
+++ b/src/controllers/session/selectServer/index.js
@@ -2,7 +2,6 @@ import loading from '../../../components/loading/loading';
 import { appRouter } from '../../../components/appRouter';
 import layoutManager from '../../../components/layoutManager';
 import libraryMenu from '../../../scripts/libraryMenu';
-import appSettings from '../../../scripts/settings/appSettings';
 import focusManager from '../../../components/focusManager';
 import globalize from '../../../scripts/globalize';
 import actionSheet from '../../../components/actionSheet/actionSheet';
@@ -114,9 +113,7 @@ import cardBuilder from '../../../components/cardbuilder/cardBuilder';
     export default function (view, params) {
         function connectToServer(server) {
             loading.show();
-            ServerConnections.connectToServer(server, {
-                enableAutoLogin: appSettings.enableAutoLogin()
-            }).then(function (result) {
+            ServerConnections.connectToServer(server).then(function (result) {
                 loading.hide();
                 const apiClient = result.ApiClient;
 
diff --git a/src/scripts/settings/appSettings.js b/src/scripts/settings/appSettings.js
index 784df48febfa..676b0634d8f2 100644
--- a/src/scripts/settings/appSettings.js
+++ b/src/scripts/settings/appSettings.js
@@ -10,14 +10,6 @@ class AppSettings {
         return name;
     }
 
-    enableAutoLogin(val) {
-        if (val !== undefined) {
-            this.set('enableAutoLogin', val.toString());
-        }
-
-        return this.get('enableAutoLogin') !== 'false';
-    }
-
     enableSystemExternalPlayers(val) {
         if (val !== undefined) {
             this.set('enableSystemExternalPlayers', val.toString());