diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index e5c1463079..04bd5d24f6 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -760,6 +760,8 @@
                 audioBitrate: mp4Quality.audioBitrate,
                 VideoCodec: mp4Quality.videoCodec,
                 AudioCodec: mp4Quality.audioCodec,
+                profile: 'baseline',
+                level: '3',
 
                 // None of the browsers seem to like this
                 EnableAutoStreamCopy: false
@@ -783,7 +785,9 @@
                 videoBitrate: m3U8Quality.videoBitrate,
                 audioBitrate: m3U8Quality.audioBitrate,
                 VideoCodec: m3U8Quality.videoCodec,
-                AudioCodec: m3U8Quality.audioCodec
+                AudioCodec: m3U8Quality.audioCodec,
+                profile: 'baseline',
+                level: '3'
 
             })) + seekParam;
 
diff --git a/dashboard-ui/scripts/remotecontrol.js b/dashboard-ui/scripts/remotecontrol.js
index 68f1e4095f..b4c8295135 100644
--- a/dashboard-ui/scripts/remotecontrol.js
+++ b/dashboard-ui/scripts/remotecontrol.js
@@ -240,7 +240,6 @@
             var deferred = $.Deferred();
 
             var sessionQuery = {
-                SupportsRemoteControl: true,
                 ControllableByUserId: Dashboard.getCurrentUserId()
             };
 
diff --git a/dashboard-ui/scripts/usersettings.js b/dashboard-ui/scripts/usersettings.js
index 41b6497363..0bc8c8e1d3 100644
--- a/dashboard-ui/scripts/usersettings.js
+++ b/dashboard-ui/scripts/usersettings.js
@@ -34,7 +34,7 @@
 
         $('#chkGroupMoviesIntoCollections', page).checked(user.Configuration.GroupMoviesIntoBoxSets || false).checkboxradio("refresh");
 
-        $('#selectSubtitlePlaybackMode', page).val(user.Configuration.SubtitleMode || "").selectmenu("refresh");
+        $('#selectSubtitlePlaybackMode', page).val(user.Configuration.SubtitleMode || "").selectmenu("refresh").trigger('change');
         $('#chkPlayDefaultAudioTrack', page).checked(user.Configuration.PlayDefaultAudioTrack || false).checkboxradio("refresh");
 
         Dashboard.hideLoadingMsg();
@@ -94,7 +94,17 @@
 
     window.UserSettingsPage = new userSettingsPage();
 
-    $(document).on('pagebeforeshow', "#userSettingsPage", function () {
+    $(document).on('pageinit', "#userSettingsPage", function () {
+
+        var page = this;
+
+        $('#selectSubtitlePlaybackMode', page).on('change', function () {
+
+            $('.subtitlesHelp', page).hide();
+            $('.subtitles' + this.value + 'Help', page).show();
+        });
+
+    }).on('pagebeforeshow', "#userSettingsPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/usersettings.html b/dashboard-ui/usersettings.html
index 8cd8ea0c85..e43e26954c 100644
--- a/dashboard-ui/usersettings.html
+++ b/dashboard-ui/usersettings.html
@@ -48,11 +48,15 @@
                         <li>
                             <label for="selectSubtitlePlaybackMode">${LabelSubtitlePlaybackMode}</label>
                             <select id="selectSubtitlePlaybackMode" data-mini="true">
-                                <option value="Default">{OptionDefaultSubtitles}</option>
-                                <option value="Always">Always</option>
-                                <option value="OnlyForced">OnlyForced</option>
-                                <option value="None">None</option>
+                                <option value="Default">${OptionDefaultSubtitles}</option>
+                                <option value="OnlyForced">${OptionOnlyForcedSubtitles}</option>
+                                <option value="Always">${OptionAlwaysPlaySubtitles}</option>
+                                <option value="None">${OptionNoSubtitles}</option>
                             </select>
+                            <div class="fieldDescription subtitlesDefaultHelp subtitlesHelp" style="display:none;">${OptionDefaultSubtitlesHelp}</div>
+                            <div class="fieldDescription subtitlesAlwaysHelp subtitlesHelp" style="display:none;">${OptionAlwaysPlaySubtitlesHelp}</div>
+                            <div class="fieldDescription subtitlesOnlyForcedHelp subtitlesHelp" style="display:none;">${OptionOnlyForcedSubtitlesHelp}</div>
+                            <div class="fieldDescription subtitlesNoneHelp subtitlesHelp" style="display:none;">${OptionNoSubtitlesHelp}</div>
                         </li>
                         <li>
                             <button type="submit" data-theme="b" data-icon="check" data-mini="true">