diff --git a/dashboard-ui/livetvsettings.html b/dashboard-ui/livetvsettings.html
index ae8fdd3d13..46c5359381 100644
--- a/dashboard-ui/livetvsettings.html
+++ b/dashboard-ui/livetvsettings.html
@@ -19,7 +19,7 @@
                     <ul data-role="listview" class="ulForm">
                         <li>
                             <label for="selectActiveService">${LabelActiveService}</label>
-                            <select id="selectActiveService" data-mini="true">
+                            <select id="selectActiveService" data-mini="true" required="required">
                             </select>
                             <div class="fieldDescription">${LabelActiveServiceHelp}</div>
                         </li>
diff --git a/dashboard-ui/scripts/edititemsubtitles.js b/dashboard-ui/scripts/edititemsubtitles.js
index 96557dbc21..c51687876a 100644
--- a/dashboard-ui/scripts/edititemsubtitles.js
+++ b/dashboard-ui/scripts/edititemsubtitles.js
@@ -130,13 +130,14 @@
             if (s.Path) {
                 itemHtml += '<a href="#" data-icon="delete" class="btnDelete" data-index="' + s.Index + '">Delete</a>';
             } else {
-                itemHtml += '<a href="#" data-icon="delete" style="visibility:hidden;" class="btnDelete" data-index="' + s.Index + '">Delete</a>';
+                itemHtml += '<a href="#" data-icon="delete" style="display:none;" class="btnDelete" data-index="' + s.Index + '">Delete</a>';
             }
 
             itemHtml += '</li>';
 
             return itemHtml;
-        });
+            
+        }).join('');
 
         html += '</ul>';
 
diff --git a/dashboard-ui/scripts/livetvsettings.js b/dashboard-ui/scripts/livetvsettings.js
index 436f45fa01..02d663957d 100644
--- a/dashboard-ui/scripts/livetvsettings.js
+++ b/dashboard-ui/scripts/livetvsettings.js
@@ -18,7 +18,7 @@
             return '<option value="' + s.Name + '">' + s.Name + '</option>';
         });
 
-        $('#selectActiveService', page).html(serviceOptions).selectmenu('refresh');
+        $('#selectActiveService', page).html(serviceOptions).val(config.LiveTvOptions.ActiveService || '').selectmenu('refresh');
 
         Dashboard.hideLoadingMsg();
     }
@@ -53,6 +53,7 @@
 
 
                 config.LiveTvOptions.GuideDays = $('#selectGuideDays', form).val() || null;
+                config.LiveTvOptions.ActiveService = $('#selectActiveService', form).val() || null;
 
                 ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult);
             });