diff --git a/dashboard-ui/livetvstatus.html b/dashboard-ui/livetvstatus.html
index b91ffb70e4..5b9a89e28e 100644
--- a/dashboard-ui/livetvstatus.html
+++ b/dashboard-ui/livetvstatus.html
@@ -4,7 +4,7 @@
     <title>${TitleLiveTV}</title>
 </head>
 <body>
-    <div id="liveTvStatusPage" data-role="page" class="page type-interior liveTvSettingsPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvstatus,scripts/taskbutton,paper-fab,paper-item-body,paper-icon-item">
+    <div id="liveTvStatusPage" data-role="page" class="page type-interior liveTvSettingsPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvstatus,scripts/taskbutton,paper-fab,paper-item-body,paper-icon-item,paper-checkbox">
 
         <div data-role="content">
             <div class="content-primary">
diff --git a/dashboard-ui/livetvtunerprovider-m3u.html b/dashboard-ui/livetvtunerprovider-m3u.html
index 8915fe3671..ffe468bef5 100644
--- a/dashboard-ui/livetvtunerprovider-m3u.html
+++ b/dashboard-ui/livetvtunerprovider-m3u.html
@@ -22,7 +22,8 @@
                     <form>
                         <div>
                             <div>
-                                <paper-input class="txtDevicePath" label="${LabelPath}" required="required"></paper-input>
+                                <paper-input class="txtDevicePath" label="${LabelFileOrUrl}" required="required" style="width:85%;display:inline-block;"></paper-input>
+                                <paper-icon-button id="btnSelectPath" icon="search"></paper-icon-button>
                             </div>
                             <br />
                             <div>
diff --git a/dashboard-ui/livetvtunerprovider-satip.html b/dashboard-ui/livetvtunerprovider-satip.html
index 5fc6a93601..0e4005f91f 100644
--- a/dashboard-ui/livetvtunerprovider-satip.html
+++ b/dashboard-ui/livetvtunerprovider-satip.html
@@ -4,7 +4,7 @@
     <title>${TitleLiveTV}</title>
 </head>
 <body>
-    <div id="liveTvTunerProviderSatPage" data-role="page" class="page type-interior liveTvSettingsPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvtunerprovider-satip,paper-input">
+    <div id="liveTvTunerProviderSatPage" data-role="page" class="page type-interior liveTvSettingsPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvtunerprovider-satip,paper-input,paper-checkbox">
 
         <div data-role="content">
             <div class="content-primary">
@@ -22,9 +22,51 @@
                     <form>
                         <div>
                             <div>
-                                <paper-input class="txtDevicePath" label="${LabelPath}" required="required" readonly></paper-input>
+                                <paper-input class="txtDevicePath" label="${LabelTunerIpAddress}" required="required"></paper-input>
                             </div>
-                            <br />
+                            <div>
+                                <br />
+                                <label class="selectLabel">Diseq C</label>
+                                <select class="selectDiseqC">
+                                    <option value="">${OptionNone}</option>
+                                    <option value="tone">22 KHz (Tone Switch)</option>
+                                    <option value="diseqc1">Diseq c 1.x (A/B/C/D)</option>
+                                </select>
+                            </div>
+                            <div>
+                                <br />
+                                <label class="selectLabel">Source A</label>
+                                <select class="selectSourceA">
+                                    <option value="">${OptionNone}</option>
+                                </select>
+                            </div>
+                            <div class="fldSourceB hide">
+                                <br />
+                                <label class="selectLabel">Source B</label>
+                                <select class="selectSourceB">
+                                    <option value="">${OptionNone}</option>
+                                </select>
+                            </div>
+                            <div class="fldSourceC hide">
+                                <br />
+                                <label class="selectLabel">Source C</label>
+                                <select class="selectSourceC">
+                                    <option value="">${OptionNone}</option>
+                                </select>
+                            </div>
+                            <div class="fldSourceD hide">
+                                <br />
+                                <label class="selectLabel">Source D</label>
+                                <select class="selectSourceD">
+                                    <option value="">${OptionNone}</option>
+                                </select>
+                            </div>
+                            <div>
+                                <br />
+                                <paper-checkbox class="chkEnabled" checked>${LabelEnableThisTuner}</paper-checkbox>
+                                <div class="fieldDescription paperCheckboxFieldDescription">${LabelEnableThisTunerHelp}</div>
+                            </div>
+                            <br /><br />
                             <div>
                                 <button type="submit" data-role="none" class="clearButton">
                                     <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
diff --git a/dashboard-ui/scripts/livetvstatus.js b/dashboard-ui/scripts/livetvstatus.js
index e3641f1eae..6689b39a29 100644
--- a/dashboard-ui/scripts/livetvstatus.js
+++ b/dashboard-ui/scripts/livetvstatus.js
@@ -451,10 +451,10 @@
 
         var menuItems = [];
 
-        //menuItems.push({
-        //    name: getTunerName('satip'),
-        //    id: 'satip'
-        //});
+        menuItems.push({
+            name: getTunerName('satip'),
+            id: 'satip'
+        });
 
         menuItems.push({
             name: 'HDHomerun',
diff --git a/dashboard-ui/scripts/livetvtunerprovider-m3u.js b/dashboard-ui/scripts/livetvtunerprovider-m3u.js
index db04068669..1b6c984c76 100644
--- a/dashboard-ui/scripts/livetvtunerprovider-m3u.js
+++ b/dashboard-ui/scripts/livetvtunerprovider-m3u.js
@@ -60,6 +60,26 @@
             return false;
         });
 
+        $('#btnSelectPath', page).on("click.selectDirectory", function () {
+
+            require(['directorybrowser'], function (directoryBrowser) {
+
+                var picker = new directoryBrowser();
+
+                picker.show({
+
+                    includeFiles: true,
+                    callback: function (path) {
+                        if (path) {
+                            $('#txtDevicePath', page).val(path);
+                        }
+                        picker.close();
+                    }
+                });
+            });
+
+        });
+
     }).on('pageshow', "#liveTvTunerProviderM3UPage", function () {
 
         var providerId = getParameterByName('id');
diff --git a/dashboard-ui/scripts/livetvtunerprovider-satip.js b/dashboard-ui/scripts/livetvtunerprovider-satip.js
index 67e5beb18f..ab071f74c0 100644
--- a/dashboard-ui/scripts/livetvtunerprovider-satip.js
+++ b/dashboard-ui/scripts/livetvtunerprovider-satip.js
@@ -12,6 +12,7 @@
                 })[0];
 
                 page.querySelector('.txtDevicePath').value = info.Url || '';
+                page.querySelector('.chkEnabled').checked = info.IsEnabled;
             });
         }
     }
@@ -30,21 +31,25 @@
                     return i.Id == id;
                 })[0];
 
-                info.Url = page.querySelector('.txtDevicePath').value;
-
+                fillInfoFromPage(page, info);
                 submitTunerInfo(page, info);
             });
 
         } else {
             var info = {
-                Type: 'satip',
-                Url: page.querySelector('.txtDevicePath').value
+                Type: 'satip'
             };
 
+            fillInfoFromPage(page, info);
             submitTunerInfo(page, info);
         }
     }
 
+    function fillInfoFromPage(page, info) {
+        info.Url = page.querySelector('.txtDevicePath').value;
+        info.IsEnabled = page.querySelector('.chkEnabled').checked;
+    }
+
     function submitTunerInfo(page, info) {
         ApiClient.ajax({
             type: "POST",
@@ -65,6 +70,28 @@
         });
     }
 
+    function onSelectDiseqCChange(e) {
+
+        var select = e.target;
+        var value = select.value;
+        var page = $(select).parents('.page')[0];
+
+        if (value) {
+            page.querySelector('.fldSourceB').classList.remove('hide');
+        } else {
+            page.querySelector('.fldSourceB').classList.add('hide');
+        }
+
+        if (value == 'diseqc1') {
+
+            page.querySelector('.fldSourceC').classList.remove('hide');
+            page.querySelector('.fldSourceD').classList.remove('hide');
+        } else {
+            page.querySelector('.fldSourceC').classList.add('hide');
+            page.querySelector('.fldSourceD').classList.add('hide');
+        }
+    }
+
     $(document).on('pageinit', "#liveTvTunerProviderSatPage", function () {
 
         var page = this;
@@ -74,6 +101,8 @@
             return false;
         });
 
+        page.querySelector('.selectDiseqC').addEventListener('change', onSelectDiseqCChange);
+
     }).on('pageshow', "#liveTvTunerProviderSatPage", function () {
 
         var providerId = getParameterByName('id');
diff --git a/dashboard-ui/strings/server.json b/dashboard-ui/strings/server.json
index 7f51045f10..d402e4f42b 100644
--- a/dashboard-ui/strings/server.json
+++ b/dashboard-ui/strings/server.json
@@ -2427,5 +2427,6 @@
     "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:"
 }
