diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 7d7974d48d1..6b4906b4268 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1322,44 +1322,39 @@
 
                   // Get network data
                   $.ajax({
-                    url: createURL("listPublicIpAddresses&id="+args.id),
+                    url: createURL('listPublicIpAddresses'),
+                    data: {
+                      listAll: true,
+                      id: args.id
+                    },
                     dataType: "json",
                     async: true,
                     success: function(json) {
                       var item = items[0];
+                      // Get VPN data
                       $.ajax({
-                        url: createURL('listNetworks'),
+                        url: createURL('listRemoteAccessVpns'),
                         data: {
-                          networkid: this.associatednetworkid
+                          listAll: true,
+                          publicipid: item.id
                         },
                         dataType: 'json',
                         async: true,
-                        success: function(data) {
-                          // Get VPN data
-                          $.ajax({
-                            url: createURL('listRemoteAccessVpns'),
-                            data: {
-                              publicipid: item.id
-                            },
-                            dataType: 'json',
-                            async: true,
-                            success: function(vpnResponse) {
-                              var isVPNEnabled = vpnResponse.listremoteaccessvpnsresponse.count;
-                              if (isVPNEnabled) {
-                                item.vpnenabled = true;
-                                item.remoteaccessvpn = vpnResponse.listremoteaccessvpnsresponse.remoteaccessvpn[0];
-                              };
+                        success: function(vpnResponse) {
+                          var isVPNEnabled = vpnResponse.listremoteaccessvpnsresponse.count;
+                          if (isVPNEnabled) {
+                            item.vpnenabled = true;
+                            item.remoteaccessvpn = vpnResponse.listremoteaccessvpnsresponse.remoteaccessvpn[0];
+                          };
 
-                              // Check if data retrieval complete
-                              item.network = data.listnetworksresponse.network[0];
-                              item.networkname = item.network.name;
-                              item.networktype = item.network.type;
+                          // Check if data retrieval complete
+                          item.network = args.context.networks[0];
+                          item.networkname = item.network.name;
+                          item.networktype = item.network.type;
 
-                              args.response.success({
-                                actionFilter: actionFilters.ipAddress,
-                                data: item
-                              });
-                            }
+                          args.response.success({
+                            actionFilter: actionFilters.ipAddress,
+                            data: item
                           });
                         }
                       });