diff --git a/src/components/tvproviders/schedulesdirect.js b/src/components/tvproviders/schedulesdirect.js
index 9af7e5be72..b42744e76d 100644
--- a/src/components/tvproviders/schedulesdirect.js
+++ b/src/components/tvproviders/schedulesdirect.js
@@ -1,119 +1,195 @@
-define(["jQuery", "loading", "emby-checkbox", "listViewStyle", "emby-input", "emby-select", "emby-button", "flexStyles"], function($, loading) {
+define(["jQuery", "loading", "emby-checkbox", "listViewStyle", "emby-input", "emby-select", "emby-button", "flexStyles"], function ($, loading) {
     "use strict";
-    return function(page, providerId, options) {
+
+    return function (page, providerId, options) {
         function reload() {
-            loading.show(), ApiClient.getNamedConfiguration("livetv").then(function(config) {
-                var info = config.ListingProviders.filter(function(i) {
-                    return i.Id === providerId
+            loading.show();
+            ApiClient.getNamedConfiguration("livetv").then(function (config) {
+                var info = config.ListingProviders.filter(function (i) {
+                    return i.Id === providerId;
                 })[0] || {};
-                listingsId = info.ListingsId, $("#selectListing", page).val(info.ListingsId || ""), page.querySelector(".txtUser").value = info.Username || "", page.querySelector(".txtPass").value = "", page.querySelector(".txtZipCode").value = info.ZipCode || "", info.Username && info.Password ? page.querySelector(".listingsSection").classList.remove("hide") : page.querySelector(".listingsSection").classList.add("hide"), page.querySelector(".chkAllTuners").checked = info.EnableAllTuners, page.querySelector(".chkAllTuners").checked ? page.querySelector(".selectTunersSection").classList.add("hide") : page.querySelector(".selectTunersSection").classList.remove("hide"), setCountry(info), refreshTunerDevices(page, info, config.TunerHosts)
-            })
+                listingsId = info.ListingsId;
+                $("#selectListing", page).val(info.ListingsId || "");
+                page.querySelector(".txtUser").value = info.Username || "";
+                page.querySelector(".txtPass").value = "";
+                page.querySelector(".txtZipCode").value = info.ZipCode || "";
+
+                if (info.Username && info.Password) {
+                    page.querySelector(".listingsSection").classList.remove("hide");
+                } else {
+                    page.querySelector(".listingsSection").classList.add("hide");
+                }
+
+                page.querySelector(".chkAllTuners").checked = info.EnableAllTuners;
+
+                if (page.querySelector(".chkAllTuners").checked) {
+                    page.querySelector(".selectTunersSection").classList.add("hide");
+                } else {
+                    page.querySelector(".selectTunersSection").classList.remove("hide");
+                }
+
+                setCountry(info);
+                refreshTunerDevices(page, info, config.TunerHosts);
+            });
         }
 
         function setCountry(info) {
-            ApiClient.getJSON(ApiClient.getUrl("LiveTv/ListingProviders/SchedulesDirect/Countries")).then(function(result) {
-                var i, length, countryList = [];
+            ApiClient.getJSON(ApiClient.getUrl("LiveTv/ListingProviders/SchedulesDirect/Countries")).then(function (result) {
+                var i;
+                var length;
+                var countryList = [];
+
                 for (var region in result) {
                     var countries = result[region];
-                    if (countries.length && "ZZZ" !== region)
-                        for (i = 0, length = countries.length; i < length; i++) countryList.push({
-                            name: countries[i].fullName,
-                            value: countries[i].shortName
-                        })
+
+                    if (countries.length && "ZZZ" !== region) {
+                        for (i = 0, length = countries.length; i < length; i++) {
+                            countryList.push({
+                                name: countries[i].fullName,
+                                value: countries[i].shortName
+                            });
+                        }
+                    }
                 }
-                countryList.sort(function(a, b) {
-                    return a.name > b.name ? 1 : a.name < b.name ? -1 : 0
-                }), $("#selectCountry", page).html(countryList.map(function(c) {
-                    return '<option value="' + c.value + '">' + c.name + "</option>"
-                }).join("")).val(info.Country || ""), $(page.querySelector(".txtZipCode")).trigger("change")
-            }, function() {
+
+                countryList.sort(function (a, b) {
+                    if (a.name > b.name) {
+                        return 1;
+                    }
+
+                    if (a.name < b.name) {
+                        return -1;
+                    }
+
+                    return 0;
+                });
+                $("#selectCountry", page).html(countryList.map(function (c) {
+                    return '<option value="' + c.value + '">' + c.name + "</option>";
+                }).join("")).val(info.Country || "");
+                $(page.querySelector(".txtZipCode")).trigger("change");
+            }, function () {
                 Dashboard.alert({
                     message: Globalize.translate("ErrorGettingTvLineups")
-                })
-            }), loading.hide()
+                });
+            });
+            loading.hide();
         }
 
         function sha256(str) {
-            if (!self.TextEncoder) return Promise.resolve("");
+            if (!self.TextEncoder) {
+                return Promise.resolve("");
+            }
+
             var buffer = new TextEncoder("utf-8").encode(str);
-            return crypto.subtle.digest("SHA-256", buffer).then(function(hash) {
-                return hex(hash)
-            })
+            return crypto.subtle.digest("SHA-256", buffer).then(function (hash) {
+                return hex(hash);
+            });
         }
 
         function hex(buffer) {
-            for (var hexCodes = [], view = new DataView(buffer), i = 0; i < view.byteLength; i += 4) {
-                var value = view.getUint32(i),
-                    stringValue = value.toString(16),
-                    paddedValue = ("00000000" + stringValue).slice(-"00000000".length);
-                hexCodes.push(paddedValue)
+            var hexCodes = [];
+
+            for (var view = new DataView(buffer), i = 0; i < view.byteLength; i += 4) {
+                var value = view.getUint32(i);
+                var stringValue = value.toString(16);
+                var paddedValue = ("00000000" + stringValue).slice(-"00000000".length);
+                hexCodes.push(paddedValue);
             }
-            return hexCodes.join("")
+
+            return hexCodes.join("");
         }
 
         function submitLoginForm() {
-            loading.show(), sha256(page.querySelector(".txtPass").value).then(function(passwordHash) {
+            loading.show();
+            sha256(page.querySelector(".txtPass").value).then(function (passwordHash) {
                 var info = {
-                        Type: "SchedulesDirect",
-                        Username: page.querySelector(".txtUser").value,
-                        EnableAllTuners: !0,
-                        Password: passwordHash,
-                        Pw: page.querySelector(".txtPass").value
-                    },
-                    id = providerId;
-                id && (info.Id = id), ApiClient.ajax({
+                    Type: "SchedulesDirect",
+                    Username: page.querySelector(".txtUser").value,
+                    EnableAllTuners: true,
+                    Password: passwordHash,
+                    Pw: page.querySelector(".txtPass").value
+                };
+                var id = providerId;
+
+                if (id) {
+                    info.Id = id;
+                }
+
+                ApiClient.ajax({
                     type: "POST",
                     url: ApiClient.getUrl("LiveTv/ListingProviders", {
-                        ValidateLogin: !0
+                        ValidateLogin: true
                     }),
                     data: JSON.stringify(info),
                     contentType: "application/json",
                     dataType: "json"
-                }).then(function(result) {
-                    Dashboard.processServerConfigurationUpdateResult(), providerId = result.Id, reload()
-                }, function() {
+                }).then(function (result) {
+                    Dashboard.processServerConfigurationUpdateResult();
+                    providerId = result.Id;
+                    reload();
+                }, function () {
                     Dashboard.alert({
                         message: Globalize.translate("ErrorSavingTvProvider")
-                    })
-                })
-            })
+                    });
+                });
+            });
         }
 
         function submitListingsForm() {
             var selectedListingsId = $("#selectListing", page).val();
-            if (!selectedListingsId) return void Dashboard.alert({
-                message: Globalize.translate("ErrorPleaseSelectLineup")
-            });
+
+            if (!selectedListingsId) {
+                return void Dashboard.alert({
+                    message: Globalize.translate("ErrorPleaseSelectLineup")
+                });
+            }
+
             loading.show();
             var id = providerId;
-            ApiClient.getNamedConfiguration("livetv").then(function(config) {
-                var info = config.ListingProviders.filter(function(i) {
-                    return i.Id === id
+            ApiClient.getNamedConfiguration("livetv").then(function (config) {
+                var info = config.ListingProviders.filter(function (i) {
+                    return i.Id === id;
                 })[0];
-                info.ZipCode = page.querySelector(".txtZipCode").value, info.Country = $("#selectCountry", page).val(), info.ListingsId = selectedListingsId, info.EnableAllTuners = page.querySelector(".chkAllTuners").checked, info.EnabledTuners = info.EnableAllTuners ? [] : $(".chkTuner", page).get().filter(function(i) {
-                    return i.checked
-                }).map(function(i) {
-                    return i.getAttribute("data-id")
-                }), ApiClient.ajax({
+                info.ZipCode = page.querySelector(".txtZipCode").value;
+                info.Country = $("#selectCountry", page).val();
+                info.ListingsId = selectedListingsId;
+                info.EnableAllTuners = page.querySelector(".chkAllTuners").checked;
+                info.EnabledTuners = info.EnableAllTuners ? [] : $(".chkTuner", page).get().filter(function (i) {
+                    return i.checked;
+                }).map(function (i) {
+                    return i.getAttribute("data-id");
+                });
+                ApiClient.ajax({
                     type: "POST",
                     url: ApiClient.getUrl("LiveTv/ListingProviders", {
-                        ValidateListings: !0
+                        ValidateListings: true
                     }),
                     data: JSON.stringify(info),
                     contentType: "application/json"
-                }).then(function(result) {
-                    loading.hide(), !1 !== options.showConfirmation && Dashboard.processServerConfigurationUpdateResult(), Events.trigger(self, "submitted")
-                }, function() {
-                    loading.hide(), Dashboard.alert({
+                }).then(function (result) {
+                    loading.hide();
+
+                    if (false !== options.showConfirmation) {
+                        Dashboard.processServerConfigurationUpdateResult();
+                    }
+
+                    Events.trigger(self, "submitted");
+                }, function () {
+                    loading.hide();
+                    Dashboard.alert({
                         message: Globalize.translate("ErrorAddingListingsToSchedulesDirect")
-                    })
-                })
-            })
+                    });
+                });
+            });
         }
 
         function refreshListings(value) {
-            if (!value) return void $("#selectListing", page).html("");
-            loading.show(), ApiClient.ajax({
+            if (!value) {
+                return void $("#selectListing", page).html("");
+            }
+
+            loading.show();
+            ApiClient.ajax({
                 type: "GET",
                 url: ApiClient.getUrl("LiveTv/ListingProviders/Lineups", {
                     Id: providerId,
@@ -121,54 +197,107 @@ define(["jQuery", "loading", "emby-checkbox", "listViewStyle", "emby-input", "em
                     Country: $("#selectCountry", page).val()
                 }),
                 dataType: "json"
-            }).then(function(result) {
-                $("#selectListing", page).html(result.map(function(o) {
-                    return '<option value="' + o.Id + '">' + o.Name + "</option>"
-                })), listingsId && $("#selectListing", page).val(listingsId), loading.hide()
-            }, function(result) {
+            }).then(function (result) {
+                $("#selectListing", page).html(result.map(function (o) {
+                    return '<option value="' + o.Id + '">' + o.Name + "</option>";
+                }));
+
+                if (listingsId) {
+                    $("#selectListing", page).val(listingsId);
+                }
+
+                loading.hide();
+            }, function (result) {
                 Dashboard.alert({
                     message: Globalize.translate("ErrorGettingTvLineups")
-                }), refreshListings(""), loading.hide()
-            })
+                });
+                refreshListings("");
+                loading.hide();
+            });
         }
 
         function getTunerName(providerId) {
             switch (providerId = providerId.toLowerCase()) {
                 case "m3u":
                     return "M3U Playlist";
+
                 case "hdhomerun":
                     return "HDHomerun";
+
                 case "satip":
                     return "DVB";
+
                 default:
-                    return "Unknown"
+                    return "Unknown";
             }
         }
 
         function refreshTunerDevices(page, providerInfo, devices) {
-            for (var html = "", i = 0, length = devices.length; i < length; i++) {
+            var html = "";
+
+            for (var i = 0, length = devices.length; i < length; i++) {
                 var device = devices[i];
                 html += '<div class="listItem">';
-                var enabledTuners = providerInfo.EnabledTuners || [],
-                    isChecked = providerInfo.EnableAllTuners || -1 !== enabledTuners.indexOf(device.Id),
-                    checkedAttribute = isChecked ? " checked" : "";
-                html += '<label class="checkboxContainer listItemCheckboxContainer"><input type="checkbox" is="emby-checkbox" data-id="' + device.Id + '" class="chkTuner" ' + checkedAttribute + "/><span></span></label>", html += '<div class="listItemBody two-line">', html += '<div class="listItemBodyText">', html += device.FriendlyName || getTunerName(device.Type), html += "</div>", html += '<div class="listItemBodyText secondary">', html += device.Url, html += "</div>", html += "</div>", html += "</div>"
+                var enabledTuners = providerInfo.EnabledTuners || [];
+                var isChecked = providerInfo.EnableAllTuners || -1 !== enabledTuners.indexOf(device.Id);
+                var checkedAttribute = isChecked ? " checked" : "";
+                html += '<label class="checkboxContainer listItemCheckboxContainer"><input type="checkbox" is="emby-checkbox" data-id="' + device.Id + '" class="chkTuner" ' + checkedAttribute + "/><span></span></label>";
+                html += '<div class="listItemBody two-line">';
+                html += '<div class="listItemBodyText">';
+                html += device.FriendlyName || getTunerName(device.Type);
+                html += "</div>";
+                html += '<div class="listItemBodyText secondary">';
+                html += device.Url;
+                html += "</div>";
+                html += "</div>";
+                html += "</div>";
             }
-            page.querySelector(".tunerList").innerHTML = html
+
+            page.querySelector(".tunerList").innerHTML = html;
         }
-        var listingsId, self = this;
-        self.submit = function() {
-            page.querySelector(".btnSubmitListingsContainer").click()
-        }, self.init = function() {
-            options = options || {}, !1 !== options.showCancelButton ? page.querySelector(".btnCancel").classList.remove("hide") : page.querySelector(".btnCancel").classList.add("hide"), !1 !== options.showSubmitButton ? page.querySelector(".btnSubmitListings").classList.remove("hide") : page.querySelector(".btnSubmitListings").classList.add("hide"), $(".formLogin", page).on("submit", function() {
-                return submitLoginForm(), !1
-            }), $(".formListings", page).on("submit", function() {
-                return submitListingsForm(), !1
-            }), $(".txtZipCode", page).on("change", function() {
-                refreshListings(this.value)
-            }), page.querySelector(".chkAllTuners").addEventListener("change", function(e) {
-                e.target.checked ? page.querySelector(".selectTunersSection").classList.add("hide") : page.querySelector(".selectTunersSection").classList.remove("hide")
-            }), $(".createAccountHelp", page).html(Globalize.translate("MessageCreateAccountAt", '<a is="emby-linkbutton" class="button-link" href="http://www.schedulesdirect.org" target="_blank">http://www.schedulesdirect.org</a>')), reload()
-        }
-    }
-});
\ No newline at end of file
+
+        var listingsId;
+        var self = this;
+
+        self.submit = function () {
+            page.querySelector(".btnSubmitListingsContainer").click();
+        };
+
+        self.init = function () {
+            options = options || {};
+
+            if (false !== options.showCancelButton) {
+                page.querySelector(".btnCancel").classList.remove("hide");
+            } else {
+                page.querySelector(".btnCancel").classList.add("hide");
+            }
+
+            if (false !== options.showSubmitButton) {
+                page.querySelector(".btnSubmitListings").classList.remove("hide");
+            } else {
+                page.querySelector(".btnSubmitListings").classList.add("hide");
+            }
+
+            $(".formLogin", page).on("submit", function () {
+                submitLoginForm();
+                return false;
+            });
+            $(".formListings", page).on("submit", function () {
+                submitListingsForm();
+                return false;
+            });
+            $(".txtZipCode", page).on("change", function () {
+                refreshListings(this.value);
+            });
+            page.querySelector(".chkAllTuners").addEventListener("change", function (e) {
+                if (e.target.checked) {
+                    page.querySelector(".selectTunersSection").classList.add("hide");
+                } else {
+                    page.querySelector(".selectTunersSection").classList.remove("hide");
+                }
+            });
+            $(".createAccountHelp", page).html(Globalize.translate("MessageCreateAccountAt", '<a is="emby-linkbutton" class="button-link" href="http://www.schedulesdirect.org" target="_blank">http://www.schedulesdirect.org</a>'));
+            reload();
+        };
+    };
+});