diff --git a/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt b/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
index 059c8ab45..7fd871be0 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
@@ -302,12 +302,9 @@
                     type:BootstrapDialog.TYPE_INFO,
                     title: "{{ lang._('Your device is rebooting') }}",
                     closable: false,
-                    onshow:function(dialogRef){
-                        dialogRef.setClosable(false);
-                        dialogRef.getModalBody().html(
-                            "{{ lang._('The upgrade has finished and your device is being rebooted at the moment, please wait...') }}" +
-                            ' <i class="fa fa-cog fa-spin"></i>'
-                        );
+                    message: "{{ lang._('The upgrade has finished and your device is being rebooted at the moment, please wait...') }}" +
+                        ' <i class="fa fa-cog fa-spin"></i>',
+                    onshow: function (dialogRef) {
                         setTimeout(rebootWait, 45000);
                     },
                 });
diff --git a/src/opnsense/mvc/app/views/OPNsense/Core/halt.volt b/src/opnsense/mvc/app/views/OPNsense/Core/halt.volt
index 6e27a2393..4b48cdc16 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Core/halt.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Core/halt.volt
@@ -38,8 +38,8 @@
                 type:BootstrapDialog.TYPE_INFO,
                 title: '{{ lang._('Your device is powering off') }}',
                 closable: false,
-                onshow: function(dialogRef){
-                    dialogRef.getModalBody().html('{{ lang._('The system is powering off now.') }}');
+                message: '{{ lang._('The system is powering off now.') }}',
+                onshow: function (dialogRef) {
                     ajaxCall('/api/core/system/halt');
                 },
             });
diff --git a/src/opnsense/mvc/app/views/OPNsense/Core/reboot.volt b/src/opnsense/mvc/app/views/OPNsense/Core/reboot.volt
index fc993f73f..aa2d326c3 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Core/reboot.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Core/reboot.volt
@@ -49,11 +49,9 @@
                 type:BootstrapDialog.TYPE_INFO,
                 title: '{{ lang._('Your device is rebooting') }}',
                 closable: false,
-                onshow: function(dialogRef){
-                    dialogRef.getModalBody().html(
-                        '{{ lang._('The system is rebooting now, please wait...') }}' +
-                        ' <i class="fa fa-cog fa-spin"></i>'
-                );
+                message: '{{ lang._('The system is rebooting now, please wait...') }}' +
+                    ' <i class="fa fa-cog fa-spin"></i>',
+                onshow: function (dialogRef) {
                     ajaxCall('/api/core/system/reboot');
                     setTimeout(rebootWait, 45000);
                 },
diff --git a/src/www/diag_defaults.php b/src/www/diag_defaults.php
index e5bfe9e48..90d8983c8 100644
--- a/src/www/diag_defaults.php
+++ b/src/www/diag_defaults.php
@@ -58,10 +58,7 @@ $(document).ready(function() {
         type:BootstrapDialog.TYPE_INFO,
         title: '<?= html_safe(gettext('Your device is powering off')) ?>',
         closable: false,
-        onshow:function(dialogRef){
-            dialogRef.setClosable(false);
-            dialogRef.getModalBody().html('<?= html_safe(gettext('The system has been reset to factory defaults and is shutting down.')) ?>');
-        },
+        message: '<?= html_safe(gettext('The system has been reset to factory defaults and is shutting down.')) ?>',
     });
 });
 </script>
diff --git a/src/www/system_advanced_admin.php b/src/www/system_advanced_admin.php
index 320926575..6c9187127 100644
--- a/src/www/system_advanced_admin.php
+++ b/src/www/system_advanced_admin.php
@@ -464,14 +464,11 @@ $(document).ready(function() {
             type:BootstrapDialog.TYPE_INFO,
             title: '<?= html_safe($savemsg) ?>',
             closable: false,
-            onshow:function(dialogRef){
-                dialogRef.setClosable(false);
-                dialogRef.getModalBody().html(
-                    '<?= html_safe(gettext('The web GUI is reloading at the moment, please wait...')) ?>' +
-                    ' <i class="fa fa-cog fa-spin"></i><br /><br />' +
-                    ' <?= html_safe(gettext('If the page does not reload go here:')) ?>' +
-                    ' <a href="<?= html_safe($url) ?>" target="_blank"><?= html_safe($url) ?></a>'
-                );
+            message: '<?= html_safe(gettext('The web GUI is reloading at the moment, please wait...')) ?>' +
+                ' <i class="fa fa-cog fa-spin"></i><br /><br />' +
+                ' <?= html_safe(gettext('If the page does not reload go here:')) ?>' +
+                ' <a href="<?= html_safe($url) ?>" target="_blank"><?= html_safe($url) ?></a>',
+            onshow: function (dialogRef) {
                 setTimeout(reloadWaitNew, 20000);
             },
         });