diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 2691496ab..3226c5893 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -61,7 +61,7 @@ my %cgiparams = ();
 &Header::getcgihash(\%cgiparams);
 
 # Find the selected interface
-my $INTF = &Network::get_intf_by_address($cgiparams{'INTERFACE'});
+my $INTF = &Network::get_intf_by_address($wlanapsettings{'INTERFACE'});
 
 delete $wlanapsettings{'__CGI__'};
 delete $wlanapsettings{'x'};
@@ -281,7 +281,7 @@ print <<END;
 END
 
 foreach my $channel (@channellist){
-	print "<option $selected{'CHANNEL'}{$channel}>";
+	print "<option value='$channel' $selected{'CHANNEL'}{$channel}>";
 	if ($channel eq 0) {
 		print "- $Lang::tr{'wlanap auto'} -";
 	} else {