diff --git a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
index 7a4104e5d3..de6ec5d633 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
@@ -489,8 +489,8 @@ function step3_stepsubmitphpaction() {
 	if (!$_POST['enable'])
 		return;
 
-	if($_POST['address']) {
-		if(!is_ipaddroralias($_POST['address'])) {
+	if($_POST['upstream_sip_server']) {
+		if(!is_ipaddroralias($_POST['upstream_sip_server'])) {
 			/* item is not an ip or alias.  error out */
 			$savemsg=gettext("Address must be a valid IP address or Firewall Alias.  Please correct this value to continue.");
 			$stepid--;
@@ -555,6 +555,10 @@ function step3_stepsubmitphpaction() {
         unset($config['ezshaper']['step3']);
         $config['ezshaper']['step3'] = array();
 
+	if (!empty($_POST['upstream_sip_server']))
+		$config['ezshaper']['step3']['address'] = $_POST['upstream_sip_server'];
+	if ($_POST['enable'] == 'on')
+		$config['ezshaper']['step3']['enable'] = 'on';
 	for ($i = 0; $i < $steps; $i++) {
 		$config['ezshaper']['step3']["local{$i}download"] = $_POST["local{$i}download"];
 		$config['ezshaper']['step3']["local{$i}downloadspeed"] = $_POST["local{$i}downloadspeed"];