diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 9f960b4c0..52bac58be 100644
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -1571,7 +1571,7 @@ sub newrule
 	my ($sip,$scidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp1'}});
 	if ($scidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp1'}}=$sip;}
 	my ($dip,$dcidr) = split("/",$fwdfwsettings{$fwdfwsettings{'grp2'}});
-	if ($scidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp2'}}=$dip;}
+	if ($dcidr eq '32'){$fwdfwsettings{$fwdfwsettings{'grp2'}}=$dip;}
 	&Header::openbox('100%', 'left', $Lang::tr{'fwdfw source'});
 	#------SOURCE-------------------------------------------------------
 	print "<form method='post'>";
diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index 34d43f3b1..049233c43 100644
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -2014,7 +2014,7 @@ sub checkname
 }
 sub checkgroup
 {
-	&General::readhasharray("$configsrvgrp", \%customservicegrp );
+	&General::readhasharray("$configgrp", \%customgrp );
 	my $name=shift;
 	foreach my $key (keys %customservicegrp) {
 		if($customservicegrp{$key}[0] eq $name){