diff --git a/dashboard-ui/components/directorybrowser/directorybrowser.js b/dashboard-ui/components/directorybrowser/directorybrowser.js
index 8ce1057862..48f16f31f1 100644
--- a/dashboard-ui/components/directorybrowser/directorybrowser.js
+++ b/dashboard-ui/components/directorybrowser/directorybrowser.js
@@ -53,10 +53,10 @@
             parentPathPromise = parentPathPromise.promise();
         }
 
-        $.when(promise, parentPathPromise).then(function (response1, response2) {
+        Promise.all(promise, parentPathPromise).then(function (responses) {
 
-            var folders = response1[0];
-            var parentPath = response2 && response2.length ? response2[0] || '' : '';
+            var folders = responses[0];
+            var parentPath = responses[1] || '';
 
             $('#txtDirectoryPickerPath', page).val(path || "");
 
diff --git a/dashboard-ui/scripts/addpluginpage.js b/dashboard-ui/scripts/addpluginpage.js
index 67656d8037..8f76696c02 100644
--- a/dashboard-ui/scripts/addpluginpage.js
+++ b/dashboard-ui/scripts/addpluginpage.js
@@ -185,9 +185,9 @@
         var promise2 = ApiClient.getInstalledPlugins();
         var promise3 = ApiClient.getPluginSecurityInfo();
 
-        $.when(promise1, promise2, promise3).then(function (response1, response2, response3) {
+        Promise.all([promise1, promise2, promise3]).then(function (responses) {
 
-            renderPackage(response1[0], response2[0], response3[0], page);
+            renderPackage(responses[0], responses[1], responses[2], page);
 
         });
 
diff --git a/dashboard-ui/scripts/appservices.js b/dashboard-ui/scripts/appservices.js
index 098a3e033b..5c4616350e 100644
--- a/dashboard-ui/scripts/appservices.js
+++ b/dashboard-ui/scripts/appservices.js
@@ -10,9 +10,9 @@
 
         var promise2 = ApiClient.getInstalledPlugins();
 
-        $.when(promise1, promise2).then(function (response1, response2) {
-            renderInstalled(page, response1[0], response2[0]);
-            renderCatalog(page, response1[0], response2[0]);
+        Promise.all([promise1, promise2]).then(function (responses) {
+            renderInstalled(page, responses[0], responses[1]);
+            renderCatalog(page, responses[0], responses[1]);
         });
     }
 
diff --git a/dashboard-ui/scripts/device.js b/dashboard-ui/scripts/device.js
index 8d7233d57a..eed304ca85 100644
--- a/dashboard-ui/scripts/device.js
+++ b/dashboard-ui/scripts/device.js
@@ -22,9 +22,9 @@
         var promise1 = ApiClient.getJSON(ApiClient.getUrl('Devices/Info', { Id: id }));
         var promise2 = ApiClient.getJSON(ApiClient.getUrl('Devices/Capabilities', { Id: id }));
 
-        $.when(promise1, promise2).then(function (response1, response2) {
+        Promise.all([promise1, promise2]).then(function (responses) {
 
-            load(page, response1[0], response2[0]);
+            load(page, responses[0], responses[1]);
 
             Dashboard.hideLoadingMsg();
         });
diff --git a/dashboard-ui/scripts/devicesupload.js b/dashboard-ui/scripts/devicesupload.js
index bfb668bec9..6e91535c20 100644
--- a/dashboard-ui/scripts/devicesupload.js
+++ b/dashboard-ui/scripts/devicesupload.js
@@ -74,10 +74,10 @@
 
         }));
 
-        $.when(promise1, promise2).then(function (response1, response2) {
+        Promise.all([promise1, promise2]).then(function (responses) {
 
 
-            load(page, response2[0].Items, response1[0]);
+            load(page, responses[1].Items, responses[0]);
 
             Dashboard.hideLoadingMsg();
         });
diff --git a/dashboard-ui/scripts/dlnaprofile.js b/dashboard-ui/scripts/dlnaprofile.js
index 67b1a821cb..5df121890d 100644
--- a/dashboard-ui/scripts/dlnaprofile.js
+++ b/dashboard-ui/scripts/dlnaprofile.js
@@ -14,11 +14,11 @@
         var promise1 = getProfile();
         var promise2 = ApiClient.getUsers();
 
-        $.when(promise1, promise2).then(function (response1, response2) {
+        Promise.all([promise1, promise2]).then(function (responses) {
 
-            currentProfile = response1[0];
+            currentProfile = responses[0];
 
-            renderProfile(page, currentProfile, response2[0]);
+            renderProfile(page, currentProfile, responses[1]);
 
             Dashboard.hideLoadingMsg();
 
diff --git a/dashboard-ui/scripts/dlnaserversettings.js b/dashboard-ui/scripts/dlnaserversettings.js
index 7f081e6f35..96b2bf2450 100644
--- a/dashboard-ui/scripts/dlnaserversettings.js
+++ b/dashboard-ui/scripts/dlnaserversettings.js
@@ -52,9 +52,9 @@
         var promise1 = ApiClient.getNamedConfiguration("dlna");
         var promise2 = ApiClient.getUsers();
 
-        $.when(promise1, promise2).then(function (response1, response2) {
+        Promise.all([promise1, promise2]).then(function (responses) {
 
-            loadPage(page, response1[0], response2[0]);
+            loadPage(page, responses[0], responses[1]);
 
         });
 
diff --git a/dashboard-ui/scripts/editorsidebar.js b/dashboard-ui/scripts/editorsidebar.js
index eaba575b07..36f6784378 100644
--- a/dashboard-ui/scripts/editorsidebar.js
+++ b/dashboard-ui/scripts/editorsidebar.js
@@ -104,11 +104,7 @@
 
     function loadChildrenOfRootNode(page, scope, callback) {
 
-        var promise2 = ApiClient.getLiveTvChannels({ limit: 0 });
-
-        $.when(promise2).then(function (response2) {
-
-            var result = response2;
+        ApiClient.getLiveTvChannels({ limit: 0 }).then(function (result) {
 
             var nodes = [];
 
diff --git a/dashboard-ui/scripts/favorites.js b/dashboard-ui/scripts/favorites.js
index a2046460cc..377930134c 100644
--- a/dashboard-ui/scripts/favorites.js
+++ b/dashboard-ui/scripts/favorites.js
@@ -160,7 +160,7 @@
             promises.push(loadSection(elem, userId, topParentId, section, sections.length == 1));
         }
 
-        $.when(promises).then(function () {
+        Promise.all(promises).then(function () {
             Dashboard.hideLoadingMsg();
 
             LibraryBrowser.setLastRefreshed(page);
diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js
index e6cc6c99c7..f9e517352b 100644
--- a/dashboard-ui/scripts/indexpage.js
+++ b/dashboard-ui/scripts/indexpage.js
@@ -125,7 +125,7 @@
             promises.push(loadSection(page, user, displayPreferences, i));
         }
 
-        return $.when(promises);
+        return Promise.all(promises);
     }
 
     var homePageDismissValue = '14';
diff --git a/dashboard-ui/scripts/livetvnewrecording.js b/dashboard-ui/scripts/livetvnewrecording.js
index 3fbede31b8..51279ed7c7 100644
--- a/dashboard-ui/scripts/livetvnewrecording.js
+++ b/dashboard-ui/scripts/livetvnewrecording.js
@@ -84,10 +84,10 @@
         var promise1 = ApiClient.getNewLiveTvTimerDefaults({ programId: programId });
         var promise2 = ApiClient.getLiveTvProgram(programId, Dashboard.getCurrentUserId());
 
-        $.when(promise1, promise2).then(function (response1, response2) {
+        Promise.all([promise1, promise2]).then(function (responses) {
 
-            var defaults = response1[0];
-            var program = response2[0];
+            var defaults = responses[0];
+            var program = responses[1];
 
             renderRecording(page, defaults, program);
         });
diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js
index 3bd92dceb1..a2d127ee81 100644
--- a/dashboard-ui/scripts/mediacontroller.js
+++ b/dashboard-ui/scripts/mediacontroller.js
@@ -418,13 +418,13 @@
                 return p.getTargets();
             });
 
-            $.when.apply($, promises).then(function () {
+            Promise.all(promises).then(function (responses) {
 
                 var targets = [];
 
-                for (var i = 0; i < arguments.length; i++) {
+                for (var i = 0; i < responses.length; i++) {
 
-                    var subTargets = arguments[i];
+                    var subTargets = responses[i];
 
                     for (var j = 0; j < subTargets.length; j++) {
 
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 90539e5710..754ac34b74 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -880,10 +880,10 @@
                 return MediaController.supportsDirectPlay(v);
             });
 
-            $.when.apply($, promises).then(function () {
+            Promise.all(promises).then(function (responses) {
 
                 for (var i = 0, length = versions.length; i < length; i++) {
-                    versions[i].enableDirectPlay = arguments[i] || false;
+                    versions[i].enableDirectPlay = responses[i] || false;
                 }
                 var optimalVersion = versions.filter(function (v) {
 
diff --git a/dashboard-ui/scripts/metadataadvanced.js b/dashboard-ui/scripts/metadataadvanced.js
index c98fa4d7fc..249b5db282 100644
--- a/dashboard-ui/scripts/metadataadvanced.js
+++ b/dashboard-ui/scripts/metadataadvanced.js
@@ -131,9 +131,9 @@
         var promise1 = ApiClient.getNamedConfiguration("chapters");
         var promise2 = ApiClient.getJSON(ApiClient.getUrl("Providers/Chapters"));
 
-        $.when(promise1, promise2).then(function (response1, response2) {
+        Promise.all([promise1, promise2]).then(function (responses) {
 
-            loadChapters(page, response1[0], response2[0]);
+            loadChapters(page, responses[0], responses[1]);
         });
     });
 
diff --git a/dashboard-ui/scripts/metadatanfo.js b/dashboard-ui/scripts/metadatanfo.js
index 41a6ce473e..2c2c2a3e3f 100644
--- a/dashboard-ui/scripts/metadatanfo.js
+++ b/dashboard-ui/scripts/metadatanfo.js
@@ -52,9 +52,9 @@
         var promise1 = ApiClient.getUsers();
         var promise2 = ApiClient.getNamedConfiguration(metadataKey);
 
-        $.when(promise1, promise2).then(function (response1, response2) {
+        Promise.all([promise1, promise2]).then(function (responses) {
 
-            loadPage(page, response2[0], response1[0]);
+            loadPage(page, responses[0], responses[0]);
         });
     });
 
diff --git a/dashboard-ui/scripts/metadatasubtitles.js b/dashboard-ui/scripts/metadatasubtitles.js
index 903ea19afc..d110a462aa 100644
--- a/dashboard-ui/scripts/metadatasubtitles.js
+++ b/dashboard-ui/scripts/metadatasubtitles.js
@@ -90,9 +90,9 @@
         var promise1 = ApiClient.getNamedConfiguration("subtitles");
         var promise2 = ApiClient.getCultures();
 
-        $.when(promise1, promise2).then(function (response1, response2) {
+        Promise.all([promise1, promise2]).then(function (responses) {
 
-            loadPage(page, response1[0], response2[0]);
+            loadPage(page, responses[0], responses[1]);
 
         });
 
diff --git a/dashboard-ui/scripts/mypreferenceslanguages.js b/dashboard-ui/scripts/mypreferenceslanguages.js
index 332e7d84f3..a74c54f685 100644
--- a/dashboard-ui/scripts/mypreferenceslanguages.js
+++ b/dashboard-ui/scripts/mypreferenceslanguages.js
@@ -67,9 +67,9 @@
 
         var allCulturesPromise = ApiClient.getCultures();
 
-        $.when(promise1, promise2).then(function (response1, response2) {
+        Promise.all([promise1, promise2]).then(function (responses) {
 
-            loadForm(page, response1[0] || response1, response2[0], allCulturesPromise);
+            loadForm(page, responses[1], responses[0], allCulturesPromise);
 
         });
 
diff --git a/dashboard-ui/scripts/notificationsetting.js b/dashboard-ui/scripts/notificationsetting.js
index 5017f8fa51..4d607ad16a 100644
--- a/dashboard-ui/scripts/notificationsetting.js
+++ b/dashboard-ui/scripts/notificationsetting.js
@@ -32,12 +32,12 @@
         var promise3 = ApiClient.getJSON(ApiClient.getUrl("Notifications/Types"));
         var promise4 = ApiClient.getJSON(ApiClient.getUrl("Notifications/Services"));
 
-        $.when(promise1, promise2, promise3, promise4).then(function (response1, response2, response3, response4) {
+        Promise.all([promise1, promise2, promise3, promise4]).then(function (responses) {
 
-            var users = response1[0];
-            var notificationOptions = response2[0];
-            var types = response3[0];
-            var services = response4[0];
+            var users = responses[0];
+            var notificationOptions = responses[1];
+            var types = responses[2];
+            var services = responses[3];
 
             var notificationConfig = notificationOptions.Options.filter(function (n) {
 
@@ -102,10 +102,10 @@
         var promise1 = ApiClient.getNamedConfiguration(notificationsConfigurationKey);
         var promise2 = ApiClient.getJSON(ApiClient.getUrl("Notifications/Types"));
 
-        $.when(promise1, promise2).then(function (response1, response2) {
+        Promise.all([promise1, promise2]).then(function (responses) {
 
-            var notificationOptions = response1[0];
-            var types = response2[0];
+            var notificationOptions = responses[0];
+            var types = responses[1];
 
             var notificationConfig = notificationOptions.Options.filter(function (n) {
 
diff --git a/dashboard-ui/scripts/plugincatalogpage.js b/dashboard-ui/scripts/plugincatalogpage.js
index d3d7e30cc2..2e07aeacec 100644
--- a/dashboard-ui/scripts/plugincatalogpage.js
+++ b/dashboard-ui/scripts/plugincatalogpage.js
@@ -22,14 +22,14 @@
 
         var promise2 = ApiClient.getInstalledPlugins();
 
-        $.when(promise1, promise2).then(function (response1, response2) {
+        Promise.all([promise1, promise2]).then(function (responses) {
 
             populateList({
 
                 catalogElement: $('#pluginTiles', page),
                 noItemsElement: $("#noPlugins", page),
-                availablePlugins: response1[0],
-                installedPlugins: response2[0]
+                availablePlugins: responses[0],
+                installedPlugins: responses[1]
 
             });
         });
diff --git a/dashboard-ui/scripts/userlibraryaccess.js b/dashboard-ui/scripts/userlibraryaccess.js
index 6209f60044..a97ad30de7 100644
--- a/dashboard-ui/scripts/userlibraryaccess.js
+++ b/dashboard-ui/scripts/userlibraryaccess.js
@@ -238,9 +238,9 @@
             SupportsPersistentIdentifier: true
         }));
 
-        $.when(promise1, promise2, promise4, promise5, promise6).then(function (response1, response2, response4, response5, response6) {
+        Promise.all([promise1, promise2, promise4, promise5, promise6]).then(function (responses) {
 
-            loadUser(page, response1[0] || response1, response2[0], response4[0].Items, response5[0].Items, response6[0].Items);
+            loadUser(page, responses[0], responses[1], responses[2].Items, responses[3].Items, responses[4].Items);
 
         });
     });
diff --git a/dashboard-ui/scripts/usernew.js b/dashboard-ui/scripts/usernew.js
index 2fa3b291c9..9856d117da 100644
--- a/dashboard-ui/scripts/usernew.js
+++ b/dashboard-ui/scripts/usernew.js
@@ -70,10 +70,10 @@
 
         var promise5 = ApiClient.getJSON(ApiClient.getUrl("Channels"));
 
-        $.when(promise4, promise5).then(function (response4, response5) {
+        Promise.all([promise4, promise5]).then(function (responses) {
 
-            loadMediaFolders(page, response4[0].Items);
-            loadChannels(page, response5[0].Items);
+            loadMediaFolders(page, responses[0].Items);
+            loadChannels(page, responses[1].Items);
 
             Dashboard.hideLoadingMsg();
         });
diff --git a/dashboard-ui/scripts/userparentalcontrol.js b/dashboard-ui/scripts/userparentalcontrol.js
index d0aea6154a..a7f8680622 100644
--- a/dashboard-ui/scripts/userparentalcontrol.js
+++ b/dashboard-ui/scripts/userparentalcontrol.js
@@ -388,28 +388,12 @@
         Dashboard.showLoadingMsg();
 
         var userId = getParameterByName("userId");
-
-        var promise1;
-
-        if (!userId) {
-
-            var deferred = $.Deferred();
-
-            deferred.resolveWith(null, [{
-                Configuration: {}
-            }]);
-
-            promise1 = deferred.promise();
-        } else {
-
-            promise1 = ApiClient.getUser(userId);
-        }
-
+        var promise1 = ApiClient.getUser(userId);
         var promise2 = ApiClient.getParentalRatings();
 
-        $.when(promise1, promise2).then(function (response1, response2) {
+        Promise.all([promise1, promise2]).then(function (responses) {
 
-            loadUser(page, response1[0] || response1, response2[0]);
+            loadUser(page, responses[0], responses[1]);
 
         });
     });
diff --git a/dashboard-ui/scripts/wizardsettings.js b/dashboard-ui/scripts/wizardsettings.js
index fefa55e8f7..fa6b798225 100644
--- a/dashboard-ui/scripts/wizardsettings.js
+++ b/dashboard-ui/scripts/wizardsettings.js
@@ -50,9 +50,9 @@
         var promise2 = apiClient.getCultures();
         var promise3 = apiClient.getCountries();
 
-        $.when(promise1, promise2, promise3).then(function (response1, response2, response3) {
+        Promise.all([promise1, promise2, promise3]).then(function (responses) {
 
-            reloadData(page, response1[0], response2[0], response3[0]);
+            reloadData(page, responses[0], responses[1], responses[2]);
 
         });
     }
diff --git a/dashboard-ui/scripts/wizardstartpage.js b/dashboard-ui/scripts/wizardstartpage.js
index d896c76598..3e69c3346d 100644
--- a/dashboard-ui/scripts/wizardstartpage.js
+++ b/dashboard-ui/scripts/wizardstartpage.js
@@ -57,9 +57,9 @@
 
         var promise2 = apiClient.getJSON(apiClient.getUrl("Localization/Options"));
 
-        $.when(promise1, promise2).then(function (response1, response2) {
+        Promise.all([promise1, promise2]).then(function (responses) {
 
-            loadPage(page, response1[0], response2[0]);
+            loadPage(page, responses[0], responses[1]);
 
         });
     });
diff --git a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.popup.js b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.popup.js
index 601abb9d7a..e1b0d04b5b 100644
--- a/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.popup.js
+++ b/dashboard-ui/thirdparty/jquerymobile-1.4.5/jqm.popup.js
@@ -598,7 +598,7 @@
 				}
 			});
 
-			$.when(prerequisites.screen, prerequisites.container).then(function () {
+			Promise.all([prerequisites.screen, prerequisites.container]).then(function () {
 				if (prerequisites === self._prerequisites) {
 					self._prerequisites = null;
 					whenDone();