diff --git a/usr/local/www/wizards/traffic_shaper_wizard.xml b/usr/local/www/wizards/traffic_shaper_wizard.xml
index 09683f2a9e..8bb1d4dbb3 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard.xml
+++ b/usr/local/www/wizards/traffic_shaper_wizard.xml
@@ -353,32 +353,38 @@
 			$queue['bandwidth'] = "0";
 			$queue['bandwidthtype'] = "Kb";
  	                $queue['attachtoqueue'] = "qLANRoot";
- 	                $config['shaper']['queue'][] = $queue;
-
-			/* create VOIP rules */
-			$rule = array();
-			$rule['descr'] = "DiffServ/Lowdelay/Upload";
-			$rule['inqueue'] = "qVOIPDown";
-			$rule['outqueue'] = "qVOIPUp";
-			$rule['interface'] = "lan";
-			$rule['source']['network'] = 'lan';
-			$rule['destination']['any'] = TRUE;
-			$rule['iptos'] = "lowdelay";
-			$config['shaper']['rule'][] = $rule;
-
-			$rule = array();
-			$rule['descr'] = "DiffServ/Lowdelay/Download";
-			$rule['inqueue'] = "qVOIPUp";
-			$rule['outqueue'] = "qVOIPDown";
-			$rule['interface'] = "wan";
-			$rule['source']['any'] = TRUE;
-			$rule['destination']['network'] = 'lan';
-			$rule['iptos'] = "lowdelay";
-			$config['shaper']['rule'][] = $rule;
+ 	                $config['shaper']['queue'][] = $queue;			
+			
 		}
-                
+
+		$voiplist[] = array();
+
+		if( $_POST['provider'] == "generic") {
+
+		    /* create VOIP rules */
+		    $rule = array();
+		    $rule['descr'] = "DiffServ/Lowdelay/Upload";
+		    $rule['inqueue'] = "qVOIPDown";
+		    $rule['outqueue'] = "qVOIPUp";
+		    $rule['interface'] = "lan";
+		    $rule['source']['network'] = 'lan';
+		    $rule['destination']['any'] = TRUE;
+		    $rule['iptos'] = "lowdelay";
+		    $config['shaper']['rule'][] = $rule;
+
+		    $rule = array();
+		    $rule['descr'] = "DiffServ/Lowdelay/Download";
+		    $rule['inqueue'] = "qVOIPUp";
+		    $rule['outqueue'] = "qVOIPDown";
+		    $rule['interface'] = "wan";
+		    $rule['source']['any'] = TRUE;
+		    $rule['destination']['network'] = 'lan';
+		    $rule['iptos'] = "lowdelay";
+		    $config['shaper']['rule'][] = $rule;
+		}
+
                 /* setup vonage rule */
-		if( $_POST['vonage'] != "") 
+		if( $_POST['provider'] == "vonage") 
 		    $voiplist[] = array('Vonage','udp','5060','5060','both');
                 
 		/* Set up/down games as higher weight */