diff --git a/dashboard-ui/components/tvproviders/schedulesdirect.js b/dashboard-ui/components/tvproviders/schedulesdirect.js
index 64f7b4894e..f27e44098d 100644
--- a/dashboard-ui/components/tvproviders/schedulesdirect.js
+++ b/dashboard-ui/components/tvproviders/schedulesdirect.js
@@ -1,4 +1,4 @@
-define(['paper-checkbox', 'paper-input'], function () {
+define(['paper-checkbox', 'paper-input', 'paper-item-body', 'paper-icon-item'], function () {
 
     return function (page, providerId, options) {
 
@@ -29,7 +29,16 @@
                     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);
             });
         }
 
@@ -91,6 +100,7 @@
                 var info = {
                     Type: 'SchedulesDirect',
                     Username: page.querySelector('.txtUser').value,
+                    EnableAllTuners: true,
                     Password: CryptoJS.SHA1(page.querySelector('.txtPass').value).toString()
                 };
 
@@ -147,6 +157,12 @@
                 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",
@@ -216,6 +232,53 @@
             });
         }
 
+        function getTunerName(providerId) {
+
+            providerId = providerId.toLowerCase();
+
+            switch (providerId) {
+
+                case 'm3u':
+                    return 'M3U Playlist';
+                case 'hdhomerun':
+                    return 'HDHomerun';
+                case 'satip':
+                    return 'DVB';
+                default:
+                    return 'Unknown';
+            }
+        }
+
+        function refreshTunerDevices(page, providerInfo, devices) {
+
+            var html = '';
+
+            for (var i = 0, length = devices.length; i < length; i++) {
+
+                var device = devices[i];
+
+                html += '<paper-icon-item>';
+
+                var isChecked = providerInfo.EnableAllTuners || providerInfo.EnabledTuners.indexOf(device.Id) != -1;
+                var checkedAttribute = isChecked ? ' checked' : '';
+                html += '<paper-checkbox data-id="' + device.Id + '" class="chkTuner" item-icon ' + checkedAttribute + '></paper-checkbox>';
+
+                html += '<paper-item-body two-line>';
+                html += '<div>';
+                html += device.FriendlyName || getTunerName(device.Type);
+                html += '</div>';
+
+                html += '<div secondary>';
+                html += device.Url;
+                html += '</div>';
+                html += '</paper-item-body>';
+
+                html += '</paper-icon-item>';
+            }
+
+            page.querySelector('.tunerList').innerHTML = html;
+        }
+
         self.submit = function () {
             page.querySelector('.btnSubmitListingsContainer').click();
         };
@@ -250,6 +313,14 @@
                 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 href="http://www.schedulesdirect.org" target="_blank">http://www.schedulesdirect.org</a>'));
 
             reload();
diff --git a/dashboard-ui/components/tvproviders/schedulesdirect.template.html b/dashboard-ui/components/tvproviders/schedulesdirect.template.html
index 8c810e2d90..7abe255a9c 100644
--- a/dashboard-ui/components/tvproviders/schedulesdirect.template.html
+++ b/dashboard-ui/components/tvproviders/schedulesdirect.template.html
@@ -10,6 +10,8 @@
 </div>
 
 <form class="formLogin">
+    <!-- Terrible, but this hidden field prevents the yellow background in chrome -->
+    <div style="height:0; overflow: hidden;"><input type="text" name="fakeusernameremembered" tabindex="-1" /><input type="password" name="fakepasswordremembered" tabindex="-1" /></div>
     <div>
         <div>
             <paper-input class="txtUser" label="${LabelUsername}" required="required" autocomplete="off"></paper-input>
@@ -52,6 +54,17 @@
                 <label for="selectListing" class="selectLabel">${LabelLineup}</label>
                 <select id="selectListing" data-mini="true" required="required"></select>
             </div>
+            <div>
+                <br /><br />
+                <paper-checkbox class="chkAllTuners">${OptionEnableForAllTuners}</paper-checkbox>
+                <div class="selectTunersSection hide">
+                    <br /><br />
+                    <div class="paperCheckboxListLabel">${HeaderTuners}</div>
+                    <div class="paperCheckboxList paperList tunerList">
+                    </div>
+                </div>
+            </div>
+            <br /><br />
             <div>
                 <button type="submit" data-role="none" class="clearButton btnSubmitListingsContainer">
                     <paper-button raised class="submit block btnSubmitListings hide"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
diff --git a/dashboard-ui/strings/en-US.json b/dashboard-ui/strings/en-US.json
index 7f51045f10..9aefaf2b2b 100644
--- a/dashboard-ui/strings/en-US.json
+++ b/dashboard-ui/strings/en-US.json
@@ -2427,5 +2427,8 @@
     "ValueExample": "1:00 PM",
     "ButtonGotIt": "Got It",
     "OptionEnableAnonymousUsageReporting": "Enable anonymous usage reporting",
-    "OptionEnableAnonymousUsageReportingHelp": "Allow Emby to collect anonymous data such as installed plugins, the version numbers of your Emby apps, etc. This information is only used for the purpose of improving the software."
+    "OptionEnableAnonymousUsageReportingHelp": "Allow Emby to collect anonymous data such as installed plugins, the version numbers of your Emby apps, etc. This information is only used for the purpose of improving the software.",
+    "LabelFileOrUrl": "File or url:",
+    "OptionEnableForAllTuners": "Enable for all tuners",
+    "HeaderTuners": "Tuners"
 }
diff --git a/dashboard-ui/strings/server.json b/dashboard-ui/strings/server.json
index d402e4f42b..fba813d6dd 100644
--- a/dashboard-ui/strings/server.json
+++ b/dashboard-ui/strings/server.json
@@ -2428,5 +2428,7 @@
     "ButtonGotIt": "Got It",
     "OptionEnableAnonymousUsageReporting": "Enable anonymous usage reporting",
     "OptionEnableAnonymousUsageReportingHelp": "Allow Emby to collect anonymous data such as installed plugins, the version numbers of your Emby apps, etc. This information is only used for the purpose of improving the software.",
-    "LabelFileOrUrl": "File or url:"
+    "LabelFileOrUrl": "File or url:",
+    "OptionEnableForAllTuners": "Enable for all tuner devices",
+    "HeaderTuners": "Tuners"
 }