diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 1ba2cfbf05f..7f735874f6c 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -768,8 +768,8 @@
                           var array1 = [];                          
                           array1.push("&name=" + todb(args.data.name));
                           array1.push("&displaytext=" + todb(args.data.displaytext));
-                          array1.push("&networkdomain=" + args.data.networkdomain);                          
-                          array1.push("&networkofferingid=" + todb(args.data.networkofferingid));                         
+                          array1.push("&networkdomain=" + args.data.networkdomain); 
+                          array1.push("&networkofferingid=" + todb(args.data.networkofferingid));    //???                     
                           $.ajax({
                             url: createURL("updateNetwork&id=" + args.context.networks[0].id + array1.join("")),
                             dataType: "json",
@@ -869,19 +869,34 @@
                             networkofferingid: { 
                               label: 'Network offering',
                               isEditable: true,
-                              select: function(args){                                
+                              select: function(args){     
+                                var items = [];                              
                                 $.ajax({
-                                  url: createURL("listNetworkOfferings&networkid=" + selectedGuestNetworkObj.id),                                   
+                                  url: createURL("listNetworkOfferings&networkid=" + selectedGuestNetworkObj.id),  //???                                                                    
                                   dataType: "json",
-                                  success: function(json) {                                    
-                                    var networkOfferingObjs = json.listnetworkofferingsresponse.networkoffering;
-                                    var items = [];
+                                  async: false,
+                                  success: function(json) {     
+                                    var networkOfferingObjs = json.listnetworkofferingsresponse.networkoffering;                                                                          
                                     $(networkOfferingObjs).each(function() {
                                       items.push({id: this.id, description: this.displaytext});
-                                    });                                   
-                                    args.response.success({data: items});                                    
+                                    });                             
                                   }
-                                });
+                                });                                                                
+                                if(items.length == 0) {                                
+                                  $.ajax({                                    
+                                    url: createURL("listNetworkOfferings"),                                    
+                                    dataType: "json",
+                                    async: false,
+                                    success: function(json) {                                                                   
+                                      var networkOfferingObjs = json.listnetworkofferingsresponse.networkoffering;                                                                          
+                                      $(networkOfferingObjs).each(function() {                                        
+                                        if(this.id == selectedGuestNetworkObj.networkofferingid)
+                                          items.push({id: this.id, description: this.displaytext});
+                                      });                                                                       
+                                    }
+                                  });                                
+                                }                               
+                                args.response.success({data: items});                                  
                               }
                             },