diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 99a9e58e4..d9f9e0f8a 100644
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -508,6 +508,7 @@ sub checksource
 			return $errormessage;
 		}
 	}elsif($fwdfwsettings{'src_addr'} eq $fwdfwsettings{$fwdfwsettings{'grp1'}} && $fwdfwsettings{'src_addr'} eq ''){
+		$fwdfwsettings{'grp1'}='std_net_src';
 		$fwdfwsettings{$fwdfwsettings{'grp1'}} = 'ALL';
 	}
 
@@ -608,6 +609,7 @@ sub checktarget
 			return $errormessage;
 		}
 	}elsif($fwdfwsettings{'tgt_addr'} eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $fwdfwsettings{'tgt_addr'} eq ''){
+		$fwdfwsettings{'grp2'}='std_net_tgt';
 		$fwdfwsettings{$fwdfwsettings{'grp2'}} = 'ALL';
 	}
 	#check for mac in targetgroup