diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 32cfabdb3e7..276e354eb04 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -123,7 +123,7 @@
                     fields: {
                       'gateway': { edit: true, label: 'Gateway' },
                       'netmask': { edit: true, label: 'Netmask' },
-                      'vlanid': { edit: true, label: 'VLAN' },
+                      'vlanid': { edit: true, label: 'VLAN', isOptional: true },
                       'startip': { edit: true, label: 'Start IP' },
                       'endip': { edit: true, label: 'End IP' },
                       'add-rule': { label: 'Add', addButton: true }
@@ -203,11 +203,9 @@
                         }
                       }
                     },
-                    dataProvider: function(args) {                      
-                      var zoneId = "6e3728bf-0b13-442c-a968-a42015291662"; //temporary until Brian fixes the bug.
-                      //var zoneId = args.context.zones[0].id;                      
+                    dataProvider: function(args) {                                             
                       $.ajax({
-                        url: createURL("listVlanIpRanges&zoneid=" + zoneId),
+                        url: createURL("listVlanIpRanges&zoneid=" + args.context.zones[0].id),
                         dataType: "json",
                         success: function(json) {                         
                           var items = json.listvlaniprangesresponse.vlaniprange;
@@ -218,8 +216,7 @@
                   });
                 }
               }
-              //???              
-              
+              //???  
             }
           }
         },
diff --git a/ui/scripts/ui/multiEdit.js b/ui/scripts/ui/multiEdit.js
index b33d8723e23..ff3e2d1ab9d 100644
--- a/ui/scripts/ui/multiEdit.js
+++ b/ui/scripts/ui/multiEdit.js
@@ -381,7 +381,7 @@
                 name: this,
                 type: 'text'
               })
-              .addClass('required')
+              .addClass(!field.isOptional ? 'required': null)
               .attr('disabled', field.isDisabled ? 'disabled' : false)
               .appendTo(
                 $('<div>').addClass('range-item').appendTo($range)
@@ -393,7 +393,7 @@
               name: fieldName,
               type: field.isPassword ? 'password' : 'text'
             })
-            .addClass('required')
+            .addClass(!field.isOptional ? 'required': null)
             .attr('disabled', field.isDisabled ? 'disabled' : false)
             .appendTo($td);
         }