diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js
index ceb3e66a96e..585c4e696d1 100644
--- a/ui/scripts/cloud.core.init.js
+++ b/ui/scripts/cloud.core.init.js
@@ -595,6 +595,7 @@ $(document).ready(function() {
 		g_domainid = null;	
 		g_timezoneoffset = null;
 		g_timezone = null;
+		g_supportELB = null;
 		
 		$.cookie('JSESSIONID', null);
 		$.cookie('sessionKey', null);
@@ -605,6 +606,7 @@ $(document).ready(function() {
 		$.cookie('networktype', null); 
 		$.cookie('timezoneoffset', null);
 		$.cookie('timezone', null);
+		$.cookie('supportELB', null);
 		
 		$("body").stopTime();
 		
@@ -691,19 +693,20 @@ $(document).ready(function() {
 				$.cookie('domainid', g_domainid, { expires: 1});				
 				$.cookie('role', g_role, { expires: 1});
 				$.cookie('timezoneoffset', g_timezoneoffset, { expires: 1});  
-				$.cookie('timezone', g_timezone, { expires: 1});  
-				
+				$.cookie('timezone', g_timezone, { expires: 1});  				
+								
 				$.ajax({
 					data: createURL("command=listCapabilities"),
 					dataType: "json",
 					async: false,
-					success: function(json) {					
-					    g_supportELB = json.listcapabilitiesresponse.capability.supportELB;
+					success: function(json) {	
 					    /* g_supportELB: guest — ips are allocated on guest network (so use 'forvirtualnetwork' = false)
 					     * g_supportELB: public  - ips are allocated on public network (so use 'forvirtualnetwork' = true)
 					     * g_supportELB: false – no ELB support
 					     */
-					    					   
+					    g_supportELB = json.listcapabilitiesresponse.capability.supportELB;					    
+					    $.cookie('supportELB', g_supportELB, { expires: 1}); 
+					    
 						if (json.listcapabilitiesresponse.capability.userpublictemplateenabled != null) {
 							g_userPublicTemplateEnabled = ""+json.listcapabilitiesresponse.capability.userpublictemplateenabled;
 							$.cookie('userpublictemplateenabled', g_userPublicTemplateEnabled, { expires: 1});
@@ -775,8 +778,8 @@ $(document).ready(function() {
 		g_domainid = $.cookie("domainid");
 		g_timezone = $.cookie("timezone");
 		g_directAttachSecurityGroupsEnabled = $.cookie("directattachsecuritygroupsenabled");
-		g_userPublicTemplateEnabled = $.cookie("userpublictemplateenabled");
-		
+		g_userPublicTemplateEnabled = $.cookie("userpublictemplateenabled");		
+				
 		if($.cookie("timezoneoffset") != null)
 			g_timezoneoffset = isNaN($.cookie("timezoneoffset"))?null: parseFloat($.cookie("timezoneoffset"));
 		else
diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js
index e7070d4a6cb..71e033002ce 100644
--- a/ui/scripts/cloud.core.ipaddress.js
+++ b/ui/scripts/cloud.core.ipaddress.js
@@ -147,9 +147,20 @@ function afterLoadIpJSP() {
 										    $("body").stopTime(timerKey);										    
 										    if (result.jobstatus == 1) {
 											    // Succeeded											    	
-											    ipToMidmenu(result.jobresult.ipaddress, $midmenuItem1);
-							                    bindClickToMidMenu($midmenuItem1, ipToRightPanel, ipGetMidmenuId);  
-							                    afterAddingMidMenuItem($midmenuItem1, true);	                            
+										    	var publicipid = result.jobresult.loadbalancer.publicipid;										    	
+										        $.ajax({
+										            data: createURL("command=listPublicIpAddresses&id="+publicipid),
+										            dataType: "json",
+										            async: false,
+										            success: function(json) {  
+										                var items = json.listpublicipaddressesresponse.publicipaddress;										               
+										                if(items != null && items.length > 0) {
+										                    ipToMidmenu(items[0], $midmenuItem1);
+										                    bindClickToMidMenu($midmenuItem1, ipToRightPanel, ipGetMidmenuId);  
+										                    afterAddingMidMenuItem($midmenuItem1, true);	
+										                }
+										            }
+										        });                     
 										    } else if (result.jobstatus == 2) {
 										        afterAddingMidMenuItem($midmenuItem1, false, fromdb(result.jobresult.errortext));					        							        								   				    
 										    }
@@ -157,8 +168,7 @@ function afterLoadIpJSP() {
 								    },
 								    error: function(XMLHttpResponse) {
 									    $("body").stopTime(timerKey);
-										handleError(XMLHttpResponse, function() {
-											debugger;
+										handleError(XMLHttpResponse, function() {											
 											afterAddingMidMenuItem($midmenuItem1, false, parseXMLHttpResponse(XMLHttpResponse));
 										});
 								    }
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index 6a610c7e1ff..cabe37e1730 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -1509,6 +1509,7 @@ var g_domainid = null;
 var g_enableLogging = false; 
 var g_timezoneoffset = null;
 var g_timezone = null;
+var g_supportELB = null;
 
 // capabilities
 var g_directAttachSecurityGroupsEnabled = "false";