diff --git a/templates/hostapd.php b/templates/hostapd.php
index 87a0c761..ce3dea1a 100755
--- a/templates/hostapd.php
+++ b/templates/hostapd.php
@@ -1,6 +1,6 @@
 <?php ob_start() ?>
   <?php if (!RASPI_MONITOR_ENABLED) : ?>
-    <input type="submit" class="btn btn-outline btn-primary" name="SaveHostAPDSettings" value="<?php echo _("Save settings"); ?>" />
+    <input type="submit" class="btn btn-outline btn-primary" id="btnSaveHostapd" name="SaveHostAPDSettings" value="<?php echo _("Save settings"); ?>" />
     <?php if ($hostapdstatus[0] == 0) : ?>
       <input type="submit" class="btn btn-success" name="StartHotspot" value="<?php echo  _("Start hotspot"); $msg=_("Starting hotspot"); ?>" data-toggle="modal" data-target="#hostapdModal"/>
     <?php else : ?>
diff --git a/templates/hostapd/basic.php b/templates/hostapd/basic.php
index f421490d..7aad0774 100644
--- a/templates/hostapd/basic.php
+++ b/templates/hostapd/basic.php
@@ -3,7 +3,7 @@
   <div class="row">
     <div class="form-group col-md-6">
       <label for="cbxinterface"><?php echo _("Interface") ;?></label>
-      <?php SelectorOptions('interface', $interfaces, $arrConfig['interface'], 'cbxinterface', 'setHardwareModeTooltip'); ?>
+      <?php SelectorOptions('interface', $interfaces, $arrConfig['interface'], 'cbxinterface', 'getChannel'); ?>
     </div>
   </div>
   <div class="row">
@@ -16,7 +16,7 @@
     <div class="form-group col-md-6">
       <label for="cbxhwmode"><?php echo _("Wireless Mode") ;?></label>
       <?php getTooltip(null, 'tiphwmode', true); ?>
-      <?php SelectorOptions('hw_mode', $arr80211Standard, $selectedHwMode, 'cbxhwmode', 'loadChannelSelect', $hwModeDisabled); ?>
+      <?php SelectorOptions('hw_mode', $arr80211Standard, $selectedHwMode, 'cbxhwmode', 'getChannel', $hwModeDisabled); ?>
       <div id="hwmode" data-tooltip="<?php echo _("The 802.11ac 5 GHz option is disabled until a compatible wireless regulatory domain is set."); ?>"></div>
     </div>
   </div>