diff --git a/src/controllers/auth/addserver.js b/src/controllers/auth/addserver.js
index 3c0fb3be04..1129283246 100644
--- a/src/controllers/auth/addserver.js
+++ b/src/controllers/auth/addserver.js
@@ -9,11 +9,12 @@ import 'emby-button';
     function handleConnectionResult(page, result) {
         loading.hide();
         switch (result.State) {
-            case 'SignedIn':
-                var apiClient = result.ApiClient;
+            case 'SignedIn': {
+                const apiClient = result.ApiClient;
                 Dashboard.onServerChanged(apiClient.getCurrentUserId(), apiClient.accessToken(), apiClient);
                 Dashboard.navigate('home.html');
                 break;
+            }
             case 'ServerSignIn':
                 Dashboard.navigate('login.html?serverid=' + result.Servers[0].Id, false, 'none');
                 break;
@@ -35,7 +36,7 @@ import 'emby-button';
 
     function submitServer(page) {
         loading.show();
-        var host = page.querySelector('#txtServerHost').value;
+        const host = page.querySelector('#txtServerHost').value;
         ConnectionManager.connectToAddress(host, {
             enableAutoLogin: appSettings.enableAutoLogin()
         }).then(function(result) {
@@ -66,6 +67,6 @@ import 'emby-button';
                 appRouter.back();
             });
         }
-    };
+    }
 
 /* eslint-enable indent */
diff --git a/src/controllers/auth/forgotpassword.js b/src/controllers/auth/forgotpassword.js
index f9fd1c2bce..ace5a3ec15 100644
--- a/src/controllers/auth/forgotpassword.js
+++ b/src/controllers/auth/forgotpassword.js
@@ -18,7 +18,7 @@ import globalize from 'globalize';
         }
 
         if ('PinCode' == result.Action) {
-            var msg = globalize.translate('MessageForgotPasswordFileCreated');
+            let msg = globalize.translate('MessageForgotPasswordFileCreated');
             msg += '<br/>';
             msg += '<br/>';
             msg += 'Enter PIN here to finish Password Reset<br/>';
@@ -50,6 +50,6 @@ import globalize from 'globalize';
         }
 
         view.querySelector('form').addEventListener('submit', onSubmit);
-    };
+    }
 
 /* eslint-enable indent */
diff --git a/src/controllers/auth/forgotpasswordpin.js b/src/controllers/auth/forgotpasswordpin.js
index d0b20f6884..a88e131eea 100644
--- a/src/controllers/auth/forgotpasswordpin.js
+++ b/src/controllers/auth/forgotpasswordpin.js
@@ -4,7 +4,7 @@ import globalize from 'globalize';
 
     function processForgotPasswordResult(result) {
         if (result.Success) {
-            var msg = globalize.translate('MessagePasswordResetForUsers');
+            let msg = globalize.translate('MessagePasswordResetForUsers');
             msg += '<br/>';
             msg += '<br/>';
             msg += result.UsersReset.join('<br/>');
@@ -38,6 +38,6 @@ import globalize from 'globalize';
         }
 
         view.querySelector('form').addEventListener('submit', onSubmit);
-    };
+    }
 
-/* eslint-disable indent */
+/* eslint-enable indent */
diff --git a/src/controllers/auth/login.js b/src/controllers/auth/login.js
index ead35d052a..fb16413ae7 100644
--- a/src/controllers/auth/login.js
+++ b/src/controllers/auth/login.js
@@ -11,14 +11,14 @@ import 'emby-checkbox';
 
 /* eslint-disable indent */
 
-    var enableFocusTransform = !browser.slow && !browser.edge;
+    const enableFocusTransform = !browser.slow && !browser.edge;
 
     function authenticateUserByName(page, apiClient, username, password) {
         loading.show();
         apiClient.authenticateUserByName(username, password).then(function (result) {
-            var user = result.User;
-            var serverId = getParameterByName('serverid');
-            var newUrl;
+            const user = result.User;
+            const serverId = getParameterByName('serverid');
+            let newUrl;
 
             if (user.Policy.IsAdministrator && !serverId) {
                 newUrl = 'dashboard.html';
@@ -68,23 +68,23 @@ import 'emby-checkbox';
         }
     }
 
-    var metroColors = ['#6FBD45', '#4BB3DD', '#4164A5', '#E12026', '#800080', '#E1B222', '#008040', '#0094FF', '#FF00C7', '#FF870F', '#7F0037'];
+    const metroColors = ['#6FBD45', '#4BB3DD', '#4164A5', '#E12026', '#800080', '#E1B222', '#008040', '#0094FF', '#FF00C7', '#FF870F', '#7F0037'];
 
     function getRandomMetroColor() {
-        var index = Math.floor(Math.random() * (metroColors.length - 1));
+        const index = Math.floor(Math.random() * (metroColors.length - 1));
         return metroColors[index];
     }
 
     function getMetroColor(str) {
         if (str) {
-            var character = String(str.substr(0, 1).charCodeAt());
-            var sum = 0;
+            const character = String(str.substr(0, 1).charCodeAt());
+            let sum = 0;
 
-            for (var i = 0; i < character.length; i++) {
+            for (let i = 0; i < character.length; i++) {
                 sum += parseInt(character.charAt(i));
             }
 
-            var index = String(sum).substr(-1);
+            const index = String(sum).substr(-1);
             return metroColors[index];
         }
 
@@ -92,13 +92,13 @@ import 'emby-checkbox';
     }
 
     function loadUserList(context, apiClient, users) {
-        var html = '';
+        let html = '';
 
-        for (var i = 0; i < users.length; i++) {
-            var user = users[i];
+        for (let i = 0; i < users.length; i++) {
+            const user = users[i];
 
             // TODO move card creation code to Card component
-            var cssClass = 'card squareCard scalableCard squareCard-scalable';
+            let cssClass = 'card squareCard scalableCard squareCard-scalable';
 
             if (layoutManager.tv) {
                 cssClass += ' show-focus';
@@ -108,13 +108,13 @@ import 'emby-checkbox';
                 }
             }
 
-            var cardBoxCssClass = 'cardBox cardBox-bottompadded';
+            const cardBoxCssClass = 'cardBox cardBox-bottompadded';
             html += '<button type="button" class="' + cssClass + '">';
             html += '<div class="' + cardBoxCssClass + '">';
             html += '<div class="cardScalable">';
             html += '<div class="cardPadder cardPadder-square"></div>';
             html += '<div class="cardContent" data-haspw="' + user.HasPassword + '" data-username="' + user.Name + '" data-userid="' + user.Id + '">';
-            var imgUrl;
+            let imgUrl;
 
             if (user.PrimaryImageTag) {
                 imgUrl = apiClient.getUserImageUrl(user.Id, {
@@ -124,7 +124,7 @@ import 'emby-checkbox';
                 });
                 html += '<div class="cardImageContainer coveredImage coveredImage-noScale" style="background-image:url(\'' + imgUrl + "');\"></div>";
             } else {
-                var background = getMetroColor(user.Id);
+                const background = getMetroColor(user.Id);
                 imgUrl = 'assets/img/avatar.png';
                 html += '<div class="cardImageContainer coveredImage coveredImage-noScale" style="background-image:url(\'' + imgUrl + "');background-color:" + background + ';"></div>';
             }
@@ -143,7 +143,7 @@ import 'emby-checkbox';
 
     export default function (view, params) {
         function getApiClient() {
-            var serverId = params.serverid;
+            const serverId = params.serverid;
 
             if (serverId) {
                 return connectionManager.getOrCreateApiClient(serverId);
@@ -163,14 +163,14 @@ import 'emby-checkbox';
         }
 
         view.querySelector('#divUsers').addEventListener('click', function (e) {
-            var card = dom.parentWithClass(e.target, 'card');
-            var cardContent = card ? card.querySelector('.cardContent') : null;
+            const card = dom.parentWithClass(e.target, 'card');
+            const cardContent = card ? card.querySelector('.cardContent') : null;
 
             if (cardContent) {
-                var context = view;
-                var id = cardContent.getAttribute('data-userid');
-                var name = cardContent.getAttribute('data-username');
-                var haspw = cardContent.getAttribute('data-haspw');
+                const context = view;
+                const id = cardContent.getAttribute('data-userid');
+                const name = cardContent.getAttribute('data-username');
+                const haspw = cardContent.getAttribute('data-haspw');
 
                 if (id === 'manual') {
                     context.querySelector('#txtManualName').value = '';
@@ -186,7 +186,7 @@ import 'emby-checkbox';
         });
         view.querySelector('.manualLoginForm').addEventListener('submit', function (e) {
             appSettings.enableAutoLogin(view.querySelector('.chkRememberLogin').checked);
-            var apiClient = getApiClient();
+            const apiClient = getApiClient();
             authenticateUserByName(view, apiClient, view.querySelector('#txtManualName').value, view.querySelector('#txtManualPassword').value);
             e.preventDefault();
             return false;
@@ -209,7 +209,7 @@ import 'emby-checkbox';
                 view.querySelector('.btnSelectServer').classList.add('hide');
             }
 
-            var apiClient = getApiClient();
+            const apiClient = getApiClient();
             apiClient.getPublicUsers().then(function (users) {
                 if (users.length) {
                     showVisualForm();
@@ -225,6 +225,6 @@ import 'emby-checkbox';
                 view.querySelector('.disclaimer').textContent = options.LoginDisclaimer || '';
             });
         });
-    };
+    }
 
 /* eslint-enable indent */
diff --git a/src/controllers/auth/selectserver.js b/src/controllers/auth/selectserver.js
index 2bdfaf1abc..6847e79435 100644
--- a/src/controllers/auth/selectserver.js
+++ b/src/controllers/auth/selectserver.js
@@ -18,10 +18,10 @@ import 'emby-button';
 
 /* eslint-disable indent */
 
-    var enableFocusTransform = !browser.slow && !browser.edge;
+    const enableFocusTransform = !browser.slow && !browser.edge;
 
     function renderSelectServerItems(view, servers) {
-        var items = servers.map(function (server) {
+        const items = servers.map(function (server) {
             return {
                 name: server.Name,
                 showIcon: true,
@@ -31,8 +31,8 @@ import 'emby-button';
                 server: server
             };
         });
-        var html = items.map(function (item) {
-            var cardImageContainer;
+        let html = items.map(function (item) {
+            let cardImageContainer;
 
             if (item.showIcon) {
                 cardImageContainer = '<span class="cardImageIcon material-icons ' + item.icon + '"></span>';
@@ -42,7 +42,7 @@ import 'emby-button';
 
             // TODO move card creation code to Card component
 
-            var cssClass = 'card overflowSquareCard loginSquareCard scalableCard overflowSquareCard-scalable';
+            let cssClass = 'card overflowSquareCard loginSquareCard scalableCard overflowSquareCard-scalable';
 
             if (layoutManager.tv) {
                 cssClass += ' show-focus';
@@ -52,10 +52,10 @@ import 'emby-button';
                 }
             }
 
-            var cardBoxCssClass = 'cardBox';
+            const cardBoxCssClass = 'cardBox';
 
-            var innerOpening = '<div class="' + cardBoxCssClass + '">';
-            var cardContainer = '';
+            const innerOpening = '<div class="' + cardBoxCssClass + '">';
+            let cardContainer = '';
             cardContainer += '<button raised class="' + cssClass + '" style="display:inline-block;" data-id="' + item.id + '" data-url="' + (item.url || '') + '" data-cardtype="' + item.cardType + '">';
             cardContainer += innerOpening;
             cardContainer += '<div class="cardScalable">';
@@ -72,7 +72,7 @@ import 'emby-button';
             cardContainer += '</div></div></button>';
             return cardContainer;
         }).join('');
-        var itemsContainer = view.querySelector('.servers');
+        const itemsContainer = view.querySelector('.servers');
 
         if (!items.length) {
             html = '<p>' + globalize.translate('MessageNoServersAvailable') + '</p>';
@@ -122,7 +122,7 @@ import 'emby-button';
                 enableAutoLogin: appSettings.enableAutoLogin()
             }).then(function (result) {
                 loading.hide();
-                var apiClient = result.ApiClient;
+                const apiClient = result.ApiClient;
 
                 switch (result.State) {
                     case 'SignedIn':
@@ -157,7 +157,7 @@ import 'emby-button';
         }
 
         function onServerClick(server) {
-            var menuItems = [];
+            const menuItems = [];
             menuItems.push({
                 name: globalize.translate('Connect'),
                 id: 'connect'
@@ -195,10 +195,10 @@ import 'emby-button';
             connectionManager.getAvailableServers().then(onServersRetrieved);
         }
 
-        var servers;
+        let servers;
         updatePageStyle(view, params);
         view.addEventListener('viewshow', function (e) {
-            var isRestored = e.detail.isRestored;
+            const isRestored = e.detail.isRestored;
             appRouter.setTitle(null);
 
             if (!isRestored) {
@@ -206,21 +206,21 @@ import 'emby-button';
             }
         });
         view.querySelector('.servers').addEventListener('click', function (e) {
-            var card = dom.parentWithClass(e.target, 'card');
+            const card = dom.parentWithClass(e.target, 'card');
 
             if (card) {
-                var url = card.getAttribute('data-url');
+                const url = card.getAttribute('data-url');
 
                 if (url) {
                     appRouter.show(url);
                 } else {
-                    var id = card.getAttribute('data-id');
+                    const id = card.getAttribute('data-id');
                     onServerClick(servers.filter(function (s) {
                         return s.Id === id;
                     })[0]);
                 }
             }
         });
-    };
+    }
 
 /* eslint-enable indent */