diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 06d56df4ed..78b81d05b2 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -4438,7 +4438,7 @@ function html_print_switch($attributes=[])
 
     $disabled_class = (bool) ($attributes['disabled']) ? ' p-slider-disabled' : '';
 
-    return "<label class='p-switch' style='".$attributes['style']."'>
+    return "<label class='p-switch ".$attributes['container-class']."' style='".$attributes['style']."'>
 			<input type='checkbox' ".$html_expand.">
 			<span class='p-slider".$disabled_class."'></span>
 		</label>";
diff --git a/pandora_console/include/javascript/pandora_ui.js b/pandora_console/include/javascript/pandora_ui.js
index 91fa0d5301..fcd2ee4ac9 100644
--- a/pandora_console/include/javascript/pandora_ui.js
+++ b/pandora_console/include/javascript/pandora_ui.js
@@ -161,6 +161,7 @@ function load_modal(settings) {
     required_buttons.push({
       class:
         "ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel",
+      id: settings.modal.cancel_button_id,
       text: settings.modal.cancel,
       click: function() {
         if (settings.oncancel != undefined) {
@@ -362,6 +363,7 @@ function load_modal(settings) {
       class:
         "ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next",
       text: settings.modal.ok,
+      id: settings.modal.ok_button_id,
       click: function() {
         if (
           settings.onsubmit != undefined &&