diff --git a/Sccp_manager.class.php b/Sccp_manager.class.php
index 92c4a00..ed7000a 100644
--- a/Sccp_manager.class.php
+++ b/Sccp_manager.class.php
@@ -173,7 +173,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
      *   Generate Input elements in Html Code from sccpgeneral.xml
      */
 
-    public function showGroup($group_name, $show_Header, $form_prefix = 'sccp', $form_values = array(), $show_inherit = true) {
+    public function showGroup($group_name, $show_Header, $form_prefix = 'sccp', $form_values = array()) {
         $htmlret = "";
         if (empty($form_values)) {
             $form_values = $this->sccpvalues;
@@ -187,7 +187,6 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
                     'fvalues' => $form_values,
                     'tftp_lang' => $this->tftpLang,
                     'metainfo' => $this->sccp_metainfo,
-                    'inherit' => $show_inherit
                   )
                 );
             }
diff --git a/views/form.adddevice.php b/views/form.adddevice.php
index 27678f5..2244b7c 100644
--- a/views/form.adddevice.php
+++ b/views/form.adddevice.php
@@ -132,7 +132,7 @@ if (!empty($device_warning)) {
     echo $this->showGroup('sccp_hw_dev_softkey', 1, 'sccp_hw', $def_val);
     // echo $this->showGroup('sccp_hw_dev_pickup', 1, 'sccp_hw', $def_val); This are line properties and does not exist!
     echo $this->showGroup('sccp_hw_dev_conference', 1, 'sccp_hw', $def_val);
-    echo $this->showGroup('sccp_dev_vendor_conf', 1, 'vendorconfig', $def_val, true);
+    echo $this->showGroup('sccp_dev_vendor_conf', 1, 'vendorconfig', $def_val);
     echo $this->showGroup('sccp_hw_dev_network', 1, 'sccp_hw', $def_val);
     ?>
 </form>
diff --git a/views/formShow.php b/views/formShow.php
index 4f45827..04527c1 100644
--- a/views/formShow.php
+++ b/views/formShow.php
@@ -382,11 +382,6 @@ foreach ($items as $child) {
                             $opt_hide .= ' data-vshow="'.$child->option_show.'" data-clshow="'.$child->option_show['class'].'" ';
                         }
                         foreach ($child->xpath('button') as $value) {
-                            if (!$inherit) {
-                                if ($value == 'Inherit') {
-                                    continue;
-                                }
-                            }
                             $val_check = strtolower((string)$value[@value]);
                             if ($val_check == strtolower($res_v)) {
                                 $val_check = " checked";
diff --git a/views/server.advanced.php b/views/server.advanced.php
index eb9b93b..b1b09f9 100644
--- a/views/server.advanced.php
+++ b/views/server.advanced.php
@@ -17,7 +17,7 @@
         $defaultVals = $this->getTableDefaults('sccpdevice', true);
 
         echo $this->showGroup('sccp_srst', 1);
-        echo $this->showGroup('sccp_dev_vendor_conf', 1,'sccpdevice', $defaultVals, false);
+        echo $this->showGroup('sccp_dev_vendor_conf', 1, 'sccpdevice', $defaultVals);
 
 ?>
 </form>