diff --git a/ui/jsp/tab_configuration.jsp b/ui/jsp/tab_configuration.jsp
index 90e156e2e1f..08141723f8c 100755
--- a/ui/jsp/tab_configuration.jsp
+++ b/ui/jsp/tab_configuration.jsp
@@ -443,7 +443,7 @@ long milliseconds = new Date().getTime();
 					<select class="select" name="add_publicip_vlan_pod" id="add_publicip_vlan_pod">					
 					</select>
 				</li>
-				<li style="display:none" id="add_publicip_vlan_domain_container">
+				<li id="add_publicip_vlan_domain_container">
 					<label for="user_name">Domain:</label>
 					<select class="select" name="add_publicip_vlan_domain" id="add_publicip_vlan_domain">					
 					</select>
diff --git a/ui/scripts/cloud.core.configuration.js b/ui/scripts/cloud.core.configuration.js
index d272a155f5b..e63ad79cff8 100644
--- a/ui/scripts/cloud.core.configuration.js
+++ b/ui/scripts/cloud.core.configuration.js
@@ -669,10 +669,7 @@ function showConfigurationTab() {
 					isTagged = thisDialog.find("#add_publicip_vlan_tagged").val() == "tagged";
 				}
 				
-				if (isDirect && isTagged) 
-					isValid &= validateString("Account", thisDialog.find("#add_publicip_vlan_account"), thisDialog.find("#add_publicip_vlan_account_errormsg"), false); //required
-				else
-				    isValid &= validateString("Account", thisDialog.find("#add_publicip_vlan_account"), thisDialog.find("#add_publicip_vlan_account_errormsg"), true); //optional
+				isValid &= validateString("Account", thisDialog.find("#add_publicip_vlan_account"), thisDialog.find("#add_publicip_vlan_account_errormsg"), true); //optional
 				
 				if (isTagged) {
 					isValid &= validateNumber("VLAN", thisDialog.find("#add_publicip_vlan_vlan"), thisDialog.find("#add_publicip_vlan_vlan_errormsg"), 2, 4095);
@@ -690,14 +687,9 @@ function showConfigurationTab() {
 					vlan = "&vlan=untagged";
 				}
 				
-				var directParams = "";
-				if (isDirect && isTagged) {
-					directParams = "&domainId="+trim(thisDialog.find("#add_publicip_vlan_domain").val())+"&account="+trim(thisDialog.find("#add_publicip_vlan_account").val());
-				} else if (isDirect && !isTagged) {
-					directParams = "&podId="+trim(thisDialog.find("#add_publicip_vlan_pod").val());
-				} else if (!isDirect && (dialogAddVlanForZone.find("#add_publicip_vlan_scope").val()=="account-specific")) {  //public VLAN, account-specific
-				    directParams = "&domainId="+trim(thisDialog.find("#add_publicip_vlan_domain").val())+"&account="+trim(thisDialog.find("#add_publicip_vlan_account").val());
-				}
+				var scopeParams = "";
+				if(dialogAddVlanForZone.find("#add_publicip_vlan_scope").val()=="account-specific")
+				    scopeParams = "&domainId="+trim(thisDialog.find("#add_publicip_vlan_domain").val())+"&account="+trim(thisDialog.find("#add_publicip_vlan_account").val());    
 				
 				var type = "true";
 				if (getNetworkType() == "vlan") type = trim(thisDialog.find("#add_publicip_vlan_type").val());
@@ -720,7 +712,7 @@ function showConfigurationTab() {
 		        template.fadeIn("slow");					
 				
 				$.ajax({
-					data: "command=createVlanIpRange&forVirtualNetwork="+type+"&zoneId="+id+vlan+directParams+"&gateway="+encodeURIComponent(gateway)+"&netmask="+encodeURIComponent(netmask)+"&startip="+encodeURIComponent(startip)+"&endip="+encodeURIComponent(endip)+"&response=json",
+					data: "command=createVlanIpRange&forVirtualNetwork="+type+"&zoneId="+id+vlan+scopeParams+"&gateway="+encodeURIComponent(gateway)+"&netmask="+encodeURIComponent(netmask)+"&startip="+encodeURIComponent(startip)+"&endip="+encodeURIComponent(endip)+"&response=json",
 					dataType: "json",
 					success: function(json) {
 						var vlan = json.createvlaniprangeresponse;
@@ -1013,21 +1005,16 @@ function showConfigurationTab() {
 	dialogAddVlanForZone.find("#add_publicip_vlan_type").change(function(event) {
 	    var addPublicipVlanTagged = dialogAddVlanForZone.find("#add_publicip_vlan_tagged").empty();
 	   	
+	   	// default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#add_publicip_vlan_domain_container", "#add_publicip_vlan_account_container". 
+		dialogAddVlanForZone.find("#add_publicip_vlan_scope").change(); 					
+				   	
 		if ($(this).val() == "false") { //direct VLAN (only tagged option)				
-			dialogAddVlanForZone.find("#add_publicip_vlan_scope_container").hide();	
 			addPublicipVlanTagged.append('<option value="tagged">tagged</option>');
 							
-			dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();
-			dialogAddVlanForZone.find("#add_publicip_vlan_domain_container").show();
-			dialogAddVlanForZone.find("#add_publicip_vlan_account_container").show();
+			dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();			
 			dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();
 			
-		} else { //public VLAN				
-			dialogAddVlanForZone.find("#add_publicip_vlan_scope_container").show();
-			
-			// default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#add_publicip_vlan_domain_container", "#add_publicip_vlan_account_container". 
-			dialogAddVlanForZone.find("#add_publicip_vlan_scope").change(); 					
-							
+		} else { //public VLAN	
 			addPublicipVlanTagged.append('<option value="untagged">untagged</option>').append('<option value="tagged">tagged</option>');	
 			
 			if (dialogAddVlanForZone.find("#add_publicip_vlan_tagged") == "tagged") {
@@ -1043,18 +1030,13 @@ function showConfigurationTab() {
 			
 	if (getNetworkType() != "vnet") {
 		dialogAddVlanForZone.find("#add_publicip_vlan_tagged").change(function(event) {
-			if (dialogAddVlanForZone.find("#add_publicip_vlan_type").val() == "false") { //direct VLAN (only tagged option)						
-				dialogAddVlanForZone.find("#add_publicip_vlan_scope_container").hide();		
-				dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();
-				dialogAddVlanForZone.find("#add_publicip_vlan_domain_container").show();
-				dialogAddVlanForZone.find("#add_publicip_vlan_account_container").show();
+			// default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#add_publicip_vlan_domain_container", "#add_publicip_vlan_account_container". 
+			dialogAddVlanForZone.find("#add_publicip_vlan_scope").change(); 	
+			
+			if (dialogAddVlanForZone.find("#add_publicip_vlan_type").val() == "false") { //direct VLAN (only tagged option)		
+				dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();				
 				dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();					
-			} else { //public VLAN		
-			    dialogAddVlanForZone.find("#add_publicip_vlan_scope_container").show();
-			    
-			    // default value of "#add_publicip_vlan_scope" is "zone-wide". Calling change() will hide "#add_publicip_vlan_domain_container", "#add_publicip_vlan_account_container". 
-			    dialogAddVlanForZone.find("#add_publicip_vlan_scope").change(); 				
-			    
+			} else { //public VLAN				    
 				if ($(this).val() == "tagged") {
 					dialogAddVlanForZone.find("#add_publicip_vlan_vlan_container").show();
 					dialogAddVlanForZone.find("#add_publicip_vlan_pod_container").hide();