diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 303b96e3c2..a338a88c61 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -33,6 +33,7 @@
 require("guiconfig.inc");
 
 $wancfg = &$config['interfaces']['wan'];
+$optcfg = &$config['interfaces']['wan'];
 
 $pconfig['username'] = $config['pppoe']['username'];
 $pconfig['password'] = $config['pppoe']['password'];
diff --git a/usr/local/www/interfaces_wan.php b/usr/local/www/interfaces_wan.php
index 303b96e3c2..a338a88c61 100755
--- a/usr/local/www/interfaces_wan.php
+++ b/usr/local/www/interfaces_wan.php
@@ -33,6 +33,7 @@
 require("guiconfig.inc");
 
 $wancfg = &$config['interfaces']['wan'];
+$optcfg = &$config['interfaces']['wan'];
 
 $pconfig['username'] = $config['pppoe']['username'];
 $pconfig['password'] = $config['pppoe']['password'];
diff --git a/usr/local/www/interfaces_wlan.inc b/usr/local/www/interfaces_wlan.inc
index ec695969d9..c5c1c45fce 100755
--- a/usr/local/www/interfaces_wlan.inc
+++ b/usr/local/www/interfaces_wlan.inc
@@ -105,7 +105,8 @@ function wireless_config_print() {
                 <tr> 
                   <td colspan="2" valign="top" class="listtopic">Wireless configuration</td>
 				</tr>
-				<?php if (strstr($optcfg['if'], "ath")): ?>
+				
+				<?php if (stristr($optcfg['if'], "ath") == true): ?>
                 <tr> 
                   <td valign="top" class="vncellreq">Standard</td>
                   <td class="vtable"><select name="standard" class="formfld" id="standard">
@@ -124,7 +125,8 @@ function wireless_config_print() {
                   <td class="vtable"><select name="mode" class="formfld" id="mode">
                       <?php 
 						$opts = array();
-						if (strstr($optcfg['if'], "wi") || strstr($optcfg['if'], "ath"))
+						if (stristr($optcfg['if'], "wi" == true) ||
+							stristr($optcfg['if'], "ath") == true)
 							$opts[] = "hostap";
 						$opts[] = "BSS";
 						$opts[] = "IBSS";