diff --git a/assets/js/sccp_manager.js b/assets/js/sccp_manager.js
index 264bc9c..5f3e9ed 100644
--- a/assets/js/sccp_manager.js
+++ b/assets/js/sccp_manager.js
@@ -287,12 +287,12 @@ $(document).ready(function () {
         });
     });
 // Form.adddevice
-    $('.hw_select').change(function (e) {
-        // data-val contains the number of buttons for this type
-        // data-id contains the max number of addons (1 = 0, 3 = 2)
+    $('.hw_select').mouseover(function (e) {
         var type_id = $('#sccp_hw_type').find(':selected').data('id');
-        var btn_dev = $('#sccp_hw_type').find(':selected').data('val');
-        if (type_id === 1) {
+        if (type_id == null) {
+            var type_id = $('#addonCnt').val();
+        }
+        if (type_id == 1) {
             if ($('#sccp_hw_addon').val() !== 'NONE') {
                 $('#sccp_hw_addon').val('NONE').change();
             }
@@ -300,9 +300,25 @@ $(document).ready(function () {
         } else {
             $('#sccp_hw_addon').prop('disabled',false);
         }
-        // when edit, btn_dev is undefined as no select, so send btn_dev with page
+    });
+
+    $('.hw_select').change(function (e) {
+        // data-val contains the number of buttons for this type
+        // data-id contains the max number of addons (1 = 0, 3 = 2)
+        var type_id = $('#sccp_hw_type').find(':selected').data('id');
+        var btn_dev = $('#sccp_hw_type').find(':selected').data('val');
+        // when edit, btn_dev is undefined as no select, so send btn_dev and type_id with page
         if (btn_dev == null) {
             var btn_dev = $('#devButtonCnt').val();
+            var type_id = $('#addonCnt').val();
+        }
+        if (type_id == 1) {
+            if ($('#sccp_hw_addon').val() !== 'NONE') {
+                $('#sccp_hw_addon').val('NONE').change();
+            }
+            $('#sccp_hw_addon').attr("disabled", "disabled");
+        } else {
+            $('#sccp_hw_addon').prop('disabled',false);
         }
         var btn_add = $('#sccp_hw_addon').find(':selected').data('val');
         // btn_add is empty if none selected
diff --git a/views/form.buttons.php b/views/form.buttons.php
index 48e224a..968cf6b 100644
--- a/views/form.buttons.php
+++ b/views/form.buttons.php
@@ -69,6 +69,7 @@ if (!empty($_REQUEST['ru_id'])) {
     <input type="hidden" name="Submit" value="Submit">
     <input type="hidden" name="buttonscount" id="buttonscount" value="<?php echo $show_buttons;?>">
     <input type="hidden" name="devButtonCnt" id="devButtonCnt" value="<?php echo (!empty($db_device['buttons']))?$db_device['buttons']:0;?>">
+    <input type="hidden" name="addonCnt" id="addonCnt" value="<?php echo (!empty($db_device['dns']))?$db_device['dns']:0;?>">
     <div class="section-title" data-for="<?php echo $forminfo[0]['name'];?>">
         <h3><i class="fa fa-minus"></i><?php echo _($forminfo[0]['label']) ?></h3>
     </div>