diff --git a/package.json b/package.json
index 230eee3f21..510c63aa07 100644
--- a/package.json
+++ b/package.json
@@ -129,6 +129,11 @@
           "src/components/syncPlay/playbackPermissionManager.js",
           "src/components/syncPlay/syncPlayManager.js",
           "src/components/syncPlay/timeSyncManager.js",
+          "src/controllers/auth/addserver.js",
+          "src/controllers/auth/forgotpassword.js",
+          "src/controllers/auth/forgotpasswordpin.js",
+          "src/controllers/auth/login.js",
+          "src/controllers/auth/selectserver.js",
           "src/controllers/dashboard/logs.js",
           "src/controllers/user/subtitles.js",
           "src/controllers/dashboard/plugins/repositories.js",
diff --git a/src/controllers/auth/addserver.js b/src/controllers/auth/addserver.js
index 622d19082e..3c0fb3be04 100644
--- a/src/controllers/auth/addserver.js
+++ b/src/controllers/auth/addserver.js
@@ -1,5 +1,10 @@
-define(['appSettings', 'loading', 'browser', 'globalize', 'emby-button'], function(appSettings, loading, browser, globalize) {
-    'use strict';
+import appSettings from 'appSettings';
+import loading from 'loading';
+import browser from 'browser';
+import globalize from 'globalize';
+import 'emby-button';
+
+/* eslint-disable indent */
 
     function handleConnectionResult(page, result) {
         loading.hide();
@@ -42,11 +47,11 @@ define(['appSettings', 'loading', 'browser', 'globalize', 'emby-button'], functi
         });
     }
 
-    return function(view, params) {
+    export default function(view, params) {
         view.querySelector('.addServerForm').addEventListener('submit', onServerSubmit);
         view.querySelector('.btnCancel').addEventListener('click', goBack);
 
-        require(['autoFocuser'], function (autoFocuser) {
+        import('autoFocuser').then(({default: autoFocuser}) => {
             autoFocuser.autoFocus(view);
         });
 
@@ -57,9 +62,10 @@ define(['appSettings', 'loading', 'browser', 'globalize', 'emby-button'], functi
         }
 
         function goBack() {
-            require(['appRouter'], function(appRouter) {
+            import('appRouter').then(({default: appRouter}) => {
                 appRouter.back();
             });
         }
     };
-});
+
+/* eslint-enable indent */
diff --git a/src/controllers/auth/forgotpassword.js b/src/controllers/auth/forgotpassword.js
index 3756bf814d..f9fd1c2bce 100644
--- a/src/controllers/auth/forgotpassword.js
+++ b/src/controllers/auth/forgotpassword.js
@@ -1,5 +1,6 @@
-define(['globalize'], function (globalize) {
-    'use strict';
+import globalize from 'globalize';
+
+/* eslint-disable indent */
 
     function processForgotPasswordResult(result) {
         if ('ContactAdmin' == result.Action) {
@@ -34,7 +35,7 @@ define(['globalize'], function (globalize) {
         }
     }
 
-    return function (view, params) {
+    export default function (view, params) {
         function onSubmit(e) {
             ApiClient.ajax({
                 type: 'POST',
@@ -50,4 +51,5 @@ define(['globalize'], function (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 2a51890d2f..d0b20f6884 100644
--- a/src/controllers/auth/forgotpasswordpin.js
+++ b/src/controllers/auth/forgotpasswordpin.js
@@ -1,5 +1,6 @@
-define(['globalize'], function (globalize) {
-    'use strict';
+import globalize from 'globalize';
+
+/* eslint-disable indent */
 
     function processForgotPasswordResult(result) {
         if (result.Success) {
@@ -22,7 +23,7 @@ define(['globalize'], function (globalize) {
         });
     }
 
-    return function (view, params) {
+    export default function (view, params) {
         function onSubmit(e) {
             ApiClient.ajax({
                 type: 'POST',
@@ -38,4 +39,5 @@ define(['globalize'], function (globalize) {
 
         view.querySelector('form').addEventListener('submit', onSubmit);
     };
-});
+
+/* eslint-disable indent */
diff --git a/src/controllers/auth/login.js b/src/controllers/auth/login.js
index c0c37e27d6..ead35d052a 100644
--- a/src/controllers/auth/login.js
+++ b/src/controllers/auth/login.js
@@ -1,5 +1,15 @@
-define(['apphost', 'appSettings', 'dom', 'connectionManager', 'loading', 'layoutManager', 'browser', 'globalize', 'cardStyle', 'emby-checkbox'], function (appHost, appSettings, dom, connectionManager, loading, layoutManager, browser, globalize) {
-    'use strict';
+import appHost from 'apphost';
+import appSettings from 'appSettings';
+import dom from 'dom';
+import connectionManager from 'connectionManager';
+import loading from 'loading';
+import layoutManager from 'layoutManager';
+import browser from 'browser';
+import globalize from 'globalize';
+import 'cardStyle';
+import 'emby-checkbox';
+
+/* eslint-disable indent */
 
     var enableFocusTransform = !browser.slow && !browser.edge;
 
@@ -26,7 +36,7 @@ define(['apphost', 'appSettings', 'dom', 'connectionManager', 'loading', 'layout
 
             const UnauthorizedOrForbidden = [401, 403];
             if (UnauthorizedOrForbidden.includes(response.status)) {
-                require(['toast'], function (toast) {
+                import('toast').then(({default: toast}) => {
                     const messageKey = response.status === 401 ? 'MessageInvalidUser' : 'MessageUnauthorizedUser';
                     toast(globalize.translate(messageKey));
                 });
@@ -131,7 +141,7 @@ define(['apphost', 'appSettings', 'dom', 'connectionManager', 'loading', 'layout
         context.querySelector('#divUsers').innerHTML = html;
     }
 
-    return function (view, params) {
+    export default function (view, params) {
         function getApiClient() {
             var serverId = params.serverid;
 
@@ -147,7 +157,7 @@ define(['apphost', 'appSettings', 'dom', 'connectionManager', 'loading', 'layout
             view.querySelector('.manualLoginForm').classList.add('hide');
             view.querySelector('.btnManual').classList.remove('hide');
 
-            require(['autoFocuser'], function (autoFocuser) {
+            import('autoFocuser').then(({default: autoFocuser}) => {
                 autoFocuser.autoFocus(view);
             });
         }
@@ -216,4 +226,5 @@ define(['apphost', 'appSettings', 'dom', 'connectionManager', 'loading', 'layout
             });
         });
     };
-});
+
+/* eslint-enable indent */
diff --git a/src/controllers/auth/selectserver.js b/src/controllers/auth/selectserver.js
index ba88313484..2bdfaf1abc 100644
--- a/src/controllers/auth/selectserver.js
+++ b/src/controllers/auth/selectserver.js
@@ -1,5 +1,22 @@
-define(['loading', 'appRouter', 'layoutManager', 'appSettings', 'apphost', 'focusManager', 'connectionManager', 'globalize', 'actionsheet', 'dom', 'browser', 'material-icons', 'flexStyles', 'emby-scroller', 'emby-itemscontainer', 'cardStyle', 'emby-button'], function (loading, appRouter, layoutManager, appSettings, appHost, focusManager, connectionManager, globalize, actionSheet, dom, browser) {
-    'use strict';
+import loading from 'loading';
+import appRouter from 'appRouter';
+import layoutManager from 'layoutManager';
+import appSettings from 'appSettings';
+import appHost from 'apphost';
+import focusManager from 'focusManager';
+import connectionManager from 'connectionManager';
+import globalize from 'globalize';
+import actionSheet from 'actionsheet';
+import dom from 'dom';
+import browser from 'browser';
+import 'material-icons';
+import 'flexStyles';
+import 'emby-scroller';
+import 'emby-itemscontainer';
+import 'cardStyle';
+import 'emby-button';
+
+/* eslint-disable indent */
 
     var enableFocusTransform = !browser.slow && !browser.edge;
 
@@ -89,7 +106,7 @@ define(['loading', 'appRouter', 'layoutManager', 'appSettings', 'apphost', 'focu
     }
 
     function alertTextWithOptions(options) {
-        require(['alert'], function (alert) {
+        import('alert').then(({default: alert}) => {
             alert(options);
         });
     }
@@ -98,7 +115,7 @@ define(['loading', 'appRouter', 'layoutManager', 'appSettings', 'apphost', 'focu
         alertText(globalize.translate('MessageUnableToConnectToServer'));
     }
 
-    return function (view, params) {
+    export default function (view, params) {
         function connectToServer(server) {
             loading.show();
             connectionManager.connectToServer(server, {
@@ -205,4 +222,5 @@ define(['loading', 'appRouter', 'layoutManager', 'appSettings', 'apphost', 'focu
             }
         });
     };
-});
+
+/* eslint-enable indent */