diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi
index 3810b8b32..afd5ece35 100755
--- a/html/cgi-bin/forwardfw.cgi
+++ b/html/cgi-bin/forwardfw.cgi
@@ -137,8 +137,8 @@ print<<END;
 		update_protocol();
 
 		// When nat not used, hide it
-		if (\$("#nat").attr("checked")) {
-			\$("#natpart").show();
+		if (! \$("#nat").attr("checked")) {
+			\$("#natpart").hide();
 		}
 
 		// Show NAT area when "use nat" checkbox is clicked
@@ -168,6 +168,23 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule')
 	&General::readhasharray("$configfwdfw", \%configfwdfw);
 	&General::readhasharray("$configinput", \%configinputfw);
 	&General::readhasharray("$configoutgoing", \%configoutgoingfw);
+	#Set Variables according to the JQuery code in protocol section
+	if ($fwdfwsettings{'PROT'} eq 'TCP' || $fwdfwsettings{'PROT'} eq 'UDP')
+	{
+		if ($fwdfwsettings{'SRC_PORT'} ne '')
+		{
+			$fwdfwsettings{'USE_SRC_PORT'} = 'ON';
+		}
+		if ($fwdfwsettings{'TGT_PORT'} ne '')
+		{
+			$fwdfwsettings{'USESRV'} = 'ON';
+			$fwdfwsettings{'grp3'} = 'TGT_PORT';
+		}
+	}
+	if ($fwdfwsettings{'PROT'} eq 'template')
+	{
+		$fwdfwsettings{'USESRV'} = 'ON';
+	}
 	$errormessage=&checksource;
 	if(!$errormessage){&checktarget;}
 	if(!$errormessage){&checkrule;}
@@ -823,7 +840,7 @@ sub checkrule
 		return;
 	}
 	#when icmp selected, no targetport allowed
-	if (($fwdfwsettings{'PROT'} ne '' && $fwdfwsettings{'PROT'} ne 'TCP' && $fwdfwsettings{'PROT'} ne 'UDP') && ($fwdfwsettings{'USESRV'} eq 'ON' || $fwdfwsettings{'USE_SRC_PORT'} eq 'ON')){
+	if (($fwdfwsettings{'PROT'} ne '' && $fwdfwsettings{'PROT'} ne 'TCP' && $fwdfwsettings{'PROT'} ne 'UDP' && $fwdfwsettings{'PROT'} ne 'template') && ($fwdfwsettings{'USESRV'} eq 'ON' || $fwdfwsettings{'USE_SRC_PORT'} eq 'ON')){
 		$errormessage.=$Lang::tr{'fwdfw err prot_port'};
 		return;
 	}
@@ -874,6 +891,12 @@ sub checkrule
 		$fwdfwsettings{'ICMP_TYPES'}='';
 		$fwdfwsettings{'USESRV'}='';
 		$fwdfwsettings{'TGT_PORT'}='';
+	}elsif($fwdfwsettings{'PROT'} eq 'IGMP'){
+		$fwdfwsettings{'USE_SRC_PORT'}='';
+		$fwdfwsettings{'SRC_PORT'}='';
+		$fwdfwsettings{'ICMP_TYPES'}='';
+		$fwdfwsettings{'USESRV'}='';
+		$fwdfwsettings{'TGT_PORT'}='';
 	}elsif($fwdfwsettings{'PROT'} ne 'TCP' && $fwdfwsettings{'PROT'} ne 'UDP' && $fwdfwsettings{'PROT'} ne 'ICMP'){
 		$fwdfwsettings{'ICMP_TYPES'}='';
 		$fwdfwsettings{'PROT'} = '';
@@ -1670,6 +1693,10 @@ END
 		&Header::closebox;
 		#---PROTOCOL------------------------------------------------------
 		&Header::openbox('100%', 'left', $Lang::tr{'fwhost prot'});
+		#Fix Protocol for JQuery
+		if ($fwdfwsettings{'grp3'} eq 'cust_srv' || $fwdfwsettings{'grp3'} eq 'cust_srvgrp'){
+			$fwdfwsettings{'PROT'} = 'template';
+		}
 		print<<END;
 		<div id="prt">
 			<table width='15%' border='0' style="float:left;">
@@ -1684,7 +1711,7 @@ END
 		print ">$Lang::tr{'all'}</option>";
 
 		print "<option value=\"template\"";
-		# XXX set selected
+		print " selected=\"selected\"" if ($fwdfwsettings{'grp3'} eq 'cust_srv' || $fwdfwsettings{'grp3'} eq 'cust_srvgrp');
 		print ">- $Lang::tr{'template'} -</option>";
 
 		foreach (@PROTOCOLS) {
@@ -1736,16 +1763,19 @@ END
 				<tr>
 					<!-- #SOURCEPORT -->
 					<td>
-						$Lang::tr{'fwdfw man port'}
+						$Lang::tr{'fwdfw use srcport'}
 					</td>
 					<td>
 						<input type='text' name='SRC_PORT' value='$fwdfwsettings{'SRC_PORT'}' maxlength='20' size='18'>
 					</td>
+					<td width='10%'>
+					</td>
 
 					<!-- #TARGETPORT -->
 					<td>
-						$Lang::tr{'fwdfw man port'}
+						$Lang::tr{'fwdfw use srv'}
 					</td>
+
 					<td>
 						<input type='text' name='TGT_PORT' value='$fwdfwsettings{'TGT_PORT'}' maxlength='20' size='18'>
 					</td>
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index a894ba022..b0875068c 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -987,8 +987,8 @@
 'fwdfw toggle' => 'Aktivieren oder deaktivieren',
 'fwdfw togglelog' => 'Log aktivieren oder deaktivieren',
 'fwdfw use nat' => 'NAT benutzen',
-'fwdfw use srcport' => 'Quellport benutzen',
-'fwdfw use srv' => 'Zielport benutzen',
+'fwdfw use srcport' => 'Quellport(s) benutzen:',
+'fwdfw use srv' => 'Zielport(s) benutzen:',
 'fwdfw useless rule' => 'Diese Regel ist nicht sinnvoll.',
 'fwdfw wd_fri' => 'Fr',
 'fwdfw wd_mon' => 'Mo',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 9eb9a8324..4b4b153c8 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1012,8 +1012,8 @@
 'fwdfw toggle' => 'Activate or deactivate',
 'fwdfw togglelog' => 'Activate or deactivate logging',
 'fwdfw use nat' => 'Use NAT',
-'fwdfw use srcport' => 'Use source port',
-'fwdfw use srv' => 'Use destination port',
+'fwdfw use srcport' => 'Use source port(s):',
+'fwdfw use srv' => 'Use destination port(s):',
 'fwdfw useless rule' => 'This rule is useless.',
 'fwdfw wd_fri' => 'Fri',
 'fwdfw wd_mon' => 'Mon',