diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
index 55aeaecf226..ff839f1a793 100644
--- a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
@@ -471,7 +471,10 @@ public class RemoteAccessVpnManagerImpl implements RemoteAccessVpnService, Manag
             _accountMgr.checkAccess(caller, publicIp);
 
             List<RemoteAccessVpnVO> vpns = new ArrayList<RemoteAccessVpnVO>(1);
-            vpns.add(_remoteAccessVpnDao.findById(ipAddress));
+            RemoteAccessVpnVO remoteVpn = _remoteAccessVpnDao.findById(ipAddress);
+            if (remoteVpn != null) {
+            	vpns.add(remoteVpn);
+            }
             return vpns;
         }
 
diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js
index 622c60016ef..c9b098e24c5 100644
--- a/ui/scripts/cloud.core.ipaddress.js
+++ b/ui/scripts/cloud.core.ipaddress.js
@@ -481,7 +481,7 @@ function showEnableVPNDialog($thisTab) {
 			var $thisDialog = $(this);
 			$spinningWheel = $thisDialog.find("#spinning_wheel").show();
 			$.ajax({
-				data: createURL("command=createRemoteAccessVpn&account="+ipObj.account+"&domainid="+ipObj.domainid+"&zoneid="+ipObj.zoneid),
+				data: createURL("command=createRemoteAccessVpn&publicip="+ipObj.ipaddress+"&account="+ipObj.account+"&domainid="+ipObj.domainid+"&zoneid="+ipObj.zoneid),
 				dataType: "json",
 				success: function(json) {
 					var jobId = json.createremoteaccessvpnresponse.jobid;
@@ -595,7 +595,7 @@ function showVpnUsers(presharedkey, publicip) {
 				var $thisDialog = $(this);
 				$spinningWheel = $thisDialog.find("#spinning_wheel").show();
 				$.ajax({
-					data: createURL("command=deleteRemoteAccessVpn&account="+ipObj.account+"&domainid="+ipObj.domainid+"&zoneid="+ipObj.zoneid),
+					data: createURL("command=deleteRemoteAccessVpn&publicip="+ipObj.ipaddress+"&account="+ipObj.account+"&domainid="+ipObj.domainid+"&zoneid="+ipObj.zoneid),
 					dataType: "json",
 					success: function(json) {
 						var jobId = json.deleteremoteaccessvpnresponse.jobid;