diff --git a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css
index fe4c60015..1d2bc7bb7 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css
@@ -182,6 +182,17 @@
     height: 100%;
 }
 
+.cardImage {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-size: contain;
+    background-repeat: no-repeat;
+    background-position: center bottom;
+}
+
 .coveredImage {
     background-size: 100% 100%;
     background-position: center center;
@@ -248,17 +259,6 @@
     white-space: normal;
 }
 
-.cardImage {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-size: contain;
-    background-repeat: no-repeat;
-    background-position: center bottom;
-}
-
 .cardImageIcon {
     width: 12vh;
     height: 12vh;
diff --git a/dashboard-ui/login.html b/dashboard-ui/login.html
index 21472fe2e..0516f5dfe 100644
--- a/dashboard-ui/login.html
+++ b/dashboard-ui/login.html
@@ -13,10 +13,14 @@
             </div>
 
             <div class="inputContainer">
-                <input is="emby-input" id="txtManualPassword" type="password" label="${LabelPassword}" />
+                <input is="emby-input" id="txtManualPassword" type="password" label="${LabelPassword}"/>
             </div>
 
-            <br />
+            <label class="checkboxContainer">
+                <input is="emby-checkbox" type="checkbox" class="chkRememberLogin" checked />
+                <span>${RememberMe}</span>
+            </label>
+
             <button is="emby-button" type="submit" class="raised accent block">
                 <i class="md-icon">check</i>
                 <span>${ButtonSignIn}</span>
diff --git a/dashboard-ui/scripts/connectlogin.js b/dashboard-ui/scripts/connectlogin.js
index 938703fe8..0969b8eb7 100644
--- a/dashboard-ui/scripts/connectlogin.js
+++ b/dashboard-ui/scripts/connectlogin.js
@@ -1,9 +1,11 @@
-define([], function () {
+define(['appSettings'], function (appSettings) {
 
     function login(page, username, password) {
 
         Dashboard.showLoadingMsg();
 
+        appSettings.enableAutoLogin(true);
+
         ConnectionManager.loginToConnect(username, password).then(function () {
 
             Dashboard.hideLoadingMsg();
@@ -77,7 +79,11 @@
 
         Dashboard.showLoadingMsg();
 
-        ConnectionManager.connect().then(function (result) {
+        ConnectionManager.connect({
+
+            enableAutoLogin: appSettings.enableAutoLogin()
+
+        }).then(function (result) {
 
             handleConnectionResult(page, result);
 
@@ -177,7 +183,11 @@
 
         Dashboard.showLoadingMsg();
 
-        ConnectionManager.connectToAddress(host).then(function (result) {
+        ConnectionManager.connectToAddress(host, {
+
+            enableAutoLogin: appSettings.enableAutoLogin()
+
+        }).then(function (result) {
 
             handleConnectionResult(page, result);
 
diff --git a/dashboard-ui/scripts/loginpage.js b/dashboard-ui/scripts/loginpage.js
index d58a66282..8a5cc47c6 100644
--- a/dashboard-ui/scripts/loginpage.js
+++ b/dashboard-ui/scripts/loginpage.js
@@ -1,4 +1,4 @@
-define(['libraryBrowser', 'cardStyle'], function (libraryBrowser) {
+define(['appSettings', 'cardStyle', 'emby-checkbox'], function (appSettings) {
 
     function getApiClient() {
 
@@ -82,6 +82,8 @@
 
     function showManualForm(context, showCancel, focusPassword) {
 
+        context.querySelector('.chkRememberLogin').checked = appSettings.enableAutoLogin();
+
         context.querySelector('.manualLoginForm').classList.remove('hide');
         context.querySelector('.visualLoginForm').classList.add('hide');
 
@@ -225,6 +227,8 @@
 
         view.querySelector('.manualLoginForm').addEventListener('submit', function (e) {
 
+            appSettings.enableAutoLogin(view.querySelector('.chkRememberLogin').checked);
+
             var apiClient = getApiClient();
             LoginPage.authenticateUserByName(view, apiClient, view.querySelector('#txtManualName').value, view.querySelector('#txtManualPassword').value);
 
diff --git a/dashboard-ui/scripts/selectserver.js b/dashboard-ui/scripts/selectserver.js
index 1d720d9b1..a0cee09c9 100644
--- a/dashboard-ui/scripts/selectserver.js
+++ b/dashboard-ui/scripts/selectserver.js
@@ -1,4 +1,4 @@
-define(['paper-icon-button-light'], function () {
+define(['appSettings', 'paper-icon-button-light'], function (appSettings) {
 
     function updatePageStyle(page) {
 
@@ -98,7 +98,11 @@
 
             Dashboard.showLoadingMsg();
 
-            ConnectionManager.connectToServer(server).then(function (result) {
+            ConnectionManager.connectToServer(server, {
+
+                enableAutoLogin: appSettings.enableAutoLogin()
+
+            }).then(function (result) {
 
                 Dashboard.hideLoadingMsg();
 
diff --git a/dashboard-ui/strings/en-US.json b/dashboard-ui/strings/en-US.json
index 78cb97d16..4ad451035 100644
--- a/dashboard-ui/strings/en-US.json
+++ b/dashboard-ui/strings/en-US.json
@@ -2318,5 +2318,6 @@
   "RemoveDownload": "Remove download",
   "SyncToOtherDevices": "Sync to other devices",
   "ManageOfflineDownloads": "Manage offline downloads",
-  "MessageDownloadScheduled": "Download scheduled"
+  "MessageDownloadScheduled": "Download scheduled",
+  "RememberMe": "Remember me"
 }