diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 06f1a98cd1..6e73b07c72 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -569,13 +569,13 @@ function filter_nat_rules_generate()
 			if($int && $external_address && $internal_address) {
 				$natrules .= "# FTP Helper binat\n";
 				$natrules .= "no binat on {$int} proto tcp from any to {$external_address} port 21\n";
-				$helpers = exec("/bin/ps awux | grep \"\-p 21 -R {$internal_address} -b {$external_address}\" | grep -v grep");
+				$helpers = exec("/bin/ps awux | /usr/bin/grep \"p 21 -R {$internal_address} -b {$external_address}\" | /usr/bin/grep -v grep");
 				if(!$helpers) {
 					/* Get the ftp queue for this interface */
 					if (isset($config['interfaces'][$rule['interface']]['ftpqueue']))
-						$shaper_queue = $config['interfaces'][$rule['interface']]['ftpqueue'];
+						$shaper_queue = "-q " . $config['interfaces'][$rule['interface']]['ftpqueue'];
 					/* else default queue configured on shaper will get this */
-					$after_filter_configure_run[] = "/usr/local/sbin/ftp-proxy {$shaper_queue} -p 21 -R {$internal_address} -b {$external_address} -T PFFTPPROXY";
+					$after_filter_configure_run[] = "/usr/local/sbin/ftp-proxy {$shaper_queue} -p 21 -R {$internal_address} -b {$external_address} -T PFFTPPROXY {$shaper_queue}";
 				}
 			}
 		}
diff --git a/usr/local/www/firewall_nat_1to1_edit.php b/usr/local/www/firewall_nat_1to1_edit.php
index c814d50dfb..155196afd7 100755
--- a/usr/local/www/firewall_nat_1to1_edit.php
+++ b/usr/local/www/firewall_nat_1to1_edit.php
@@ -122,7 +122,7 @@ if ($_POST) {
 		if($a_1to1[$id]['useftphelper']) {
 			if($a_1to1[$id]['external'] != $_POST['external'] or 
 				$a_1to1[$id]['internal'] != $_POST['internal'] or !$_POST['useftphelper']) {
-				$helpers = `/bin/ps awux | grep "p 21 -R {$a_1to1[$id]['internal']} -b {$a_1to1[$id]['external']}" | grep -v grep | awk '{ print $2 }'`;
+				$helpers = `/bin/ps awux | /usr/bin/grep "p 21 -R {$a_1to1[$id]['internal']} -b {$a_1to1[$id]['external']}" | /usr/bin/grep -v grep | /usr/bin/awk '{ print $2 }'`;
 				if($helpers) 
 					exec("kill $helpers");
 			}