diff --git a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingfields.js b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingfields.js
index 9f2116ef07..77421a1e04 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingfields.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingfields.js
@@ -1,4 +1,4 @@
-define(['globalize', 'connectionManager', 'require', 'loading', 'apphost', 'recordingHelper', 'paper-icon-button-light', 'emby-button'], function (globalize, connectionManager, require, loading, appHost, recordingHelper) {
+define(['globalize', 'connectionManager', 'require', 'loading', 'apphost', 'dom', 'recordingHelper', 'paper-icon-button-light', 'emby-button'], function (globalize, connectionManager, require, loading, appHost, dom, recordingHelper) {
 
     function getRegistration(apiClient, programId, feature) {
 
@@ -204,7 +204,8 @@
         var options = this.options;
         var apiClient = connectionManager.getApiClient(options.serverId);
 
-        var isChecked = !e.target.querySelector('i').classList.contains('recordingIcon-active');
+        var button = dom.parentWithTag(e.target, 'BUTTON');
+        var isChecked = !button.querySelector('i').classList.contains('recordingIcon-active');
 
         if (isChecked) {
             if (!this.TimerId && !this.SeriesTimerId) {
@@ -229,7 +230,8 @@
         var options = this.options;
         var apiClient = connectionManager.getApiClient(options.serverId);
 
-        var isChecked = !e.target.querySelector('i').classList.contains('recordingIcon-active');
+        var button = dom.parentWithTag(e.target, 'BUTTON');
+        var isChecked = !button.querySelector('i').classList.contains('recordingIcon-active');
 
         if (isChecked) {
             showSeriesRecordingFields(options.parent, options.programId, apiClient);
diff --git a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingfields.template.html b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingfields.template.html
index ce08dff98f..ad6d837bd0 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingfields.template.html
+++ b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingfields.template.html
@@ -5,7 +5,7 @@
 
     .recordingButton {
         margin-left: 0;
-        padding: .6em 1.05em .55em .8em;
+        padding: .65em 1.05em .6em .8em;
         min-width: 10em;
     }
 
diff --git a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/seriesrecordingeditor.template.html b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/seriesrecordingeditor.template.html
index a11358df08..ce09e3d043 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/seriesrecordingeditor.template.html
+++ b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/seriesrecordingeditor.template.html
@@ -23,10 +23,6 @@
                 </select>
             </div>
 
-           <h1>
-                ${Advanced}
-            </h1>
-
             <div class="inputContainer">
                 <input is="emby-input" type="number" id="txtPrePaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPrePaddingMinutes}" />
             </div>
diff --git a/dashboard-ui/scripts/encodingsettings.js b/dashboard-ui/scripts/encodingsettings.js
index 8dc8f675ee..df5d0ac753 100644
--- a/dashboard-ui/scripts/encodingsettings.js
+++ b/dashboard-ui/scripts/encodingsettings.js
@@ -44,10 +44,6 @@
 
         return ApiClient.getSystemInfo().then(function (systemInfo) {
 
-            if (systemInfo.EncoderLocationType == "External") {
-                return;
-            }
-
             return ApiClient.ajax({
                 url: ApiClient.getUrl('System/MediaEncoder/Path'),
                 type: 'POST',
@@ -212,11 +208,7 @@
 
             ApiClient.getSystemInfo().then(function (systemInfo) {
 
-                if (systemInfo.EncoderLocationType == "External") {
-                    page.querySelector('.fldSelectEncoderPathType').classList.add('hide');
-                } else {
-                    page.querySelector('.fldSelectEncoderPathType').classList.remove('hide');
-                }
+                page.querySelector('.fldSelectEncoderPathType').classList.remove('hide');
                 loadPage(page, config, systemInfo);
             });
         });
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 0a0ba7cf59..28d4e232af 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -676,11 +676,11 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
             }
 
             var onBitrateDetected = function () {
+
                 Dashboard.getDeviceProfile(null, {
                     
                     enableMkvProgressive: item.RunTimeTicks != null,
-                    enableTsProgressive: item.RunTimeTicks != null,
-                    enableHls: !browserInfo.firefox || item.RunTimeTicks == null
+                    enableTsProgressive: item.RunTimeTicks != null
 
                 }).then(function (deviceProfile) {
                     playOnDeviceProfileCreated(deviceProfile, item, startPosition, callback);
diff --git a/dashboard-ui/scripts/userprofilespage.js b/dashboard-ui/scripts/userprofilespage.js
index ec6d1bea82..586ec6be0a 100644
--- a/dashboard-ui/scripts/userprofilespage.js
+++ b/dashboard-ui/scripts/userprofilespage.js
@@ -6,7 +6,14 @@
 
         require(['confirm'], function (confirm) {
 
-            confirm(msg, Globalize.translate('DeleteUser')).then(function () {
+            confirm({
+                
+                title: Globalize.translate('DeleteUser'),
+                text: msg,
+                confirmText: Globalize.translate('ButtonDelete'),
+                primary: 'cancel'
+
+            }).then(function () {
 
                 Dashboard.showLoadingMsg();