diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
index 15e5378c9..379ff8628 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
@@ -200,6 +200,10 @@ class Array2XML {
 					'vcpus' => 2,
 					'vcpu' => [0,1],
 				],
+				'media' => [
+					'cdrombus' => 'sata',
+					'driversbus' => 'sata' ,
+				],			
 				'disk' => [
 					[
 						'size' => '64G'
diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index 94340d5d6..e41ad22e8 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -2507,15 +2507,6 @@ $(function() {
 		}
 	});
 
-	$("#vmform #domain_machine").change(function changeMachineEvent(){
-		// Cdrom Bus: select IDE for i440 and SATA for q35
-		if ($(this).val().indexOf('i440fx') != -1) {
-			$('#vmform .cdrom_bus').val('ide');
-		} else {
-			$('#vmform .cdrom_bus').val('sata');
-		}
-	});
-
 	$("#vmform #domain_ovmf").change(function changeBIOSEvent(){
 		// using OVMF - disable vmvga vnc option
 		if ($(this).val() != '0' && $("#vmform #vncmodel").val() == 'vmvga') {
diff --git a/emhttp/plugins/dynamix/include/Helpers.php b/emhttp/plugins/dynamix/include/Helpers.php
index 5c3dfacc5..61a84cab9 100644
--- a/emhttp/plugins/dynamix/include/Helpers.php
+++ b/emhttp/plugins/dynamix/include/Helpers.php
@@ -180,7 +180,6 @@ function my_error($code) {
 }
 
 function mk_option($select, $value, $text, $extra="") {
-  $text = htmlspecialchars($text);
   return "<option value='$value'".($value == $select ? " selected" : "").(strlen($extra) ? " $extra" : "").">$text</option>";
 }