diff --git a/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js b/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js
index 566d19f137..6886f5dd19 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js
@@ -329,6 +329,20 @@ define(['browser'], function (browser) {
             });
         }
 
+        // Put mp4 ahead of webm
+        if (browser.firefox) {
+            profile.TranscodingProfiles.push({
+                Container: 'mp4',
+                Type: 'Video',
+                AudioCodec: videoAudioCodecs.join(','),
+                VideoCodec: 'h264',
+                Context: 'Streaming',
+                Protocol: 'http',
+                // If audio transcoding is needed, limit to 2 channel
+                MaxAudioChannels: '2'
+            });
+        }
+
         if (canPlayWebm) {
 
             profile.TranscodingProfiles.push({
diff --git a/dashboard-ui/scripts/taskbutton.js b/dashboard-ui/scripts/taskbutton.js
index 2e4311f419..a12abbd186 100644
--- a/dashboard-ui/scripts/taskbutton.js
+++ b/dashboard-ui/scripts/taskbutton.js
@@ -85,7 +85,7 @@
             var id = button.getAttribute('data-taskid');
 
             var key = 'scheduledTaskButton' + options.taskKey;
-            var expectedValue = new Date().getMonth() + '5';
+            var expectedValue = new Date().getMonth() + '6';
 
             if (appStorage.getItem(key) == expectedValue) {
                 onScheduledTaskMessageConfirmed(button, id);
@@ -99,7 +99,13 @@
 
                 require(['confirm'], function (confirm) {
 
-                    confirm(msg, Globalize.translate('HeaderConfirmation')).then(function () {
+                    confirm({
+
+                        title: Globalize.translate('HeaderConfirmation'),
+                        html: msg,
+                        text: Globalize.translate('ConfirmMessageScheduledTaskButton') + "\n\n" + Globalize.translate('ButtonScheduledTasks')
+
+                    }).then(function () {
                         appStorage.setItem(key, expectedValue);
                         onScheduledTaskMessageConfirmed(button, id);
                     });