diff --git a/server/src/com/cloud/api/commands/AddVpnUserCmd.java b/server/src/com/cloud/api/commands/AddVpnUserCmd.java
index cd01e4e0155..2e23ce9afda 100644
--- a/server/src/com/cloud/api/commands/AddVpnUserCmd.java
+++ b/server/src/com/cloud/api/commands/AddVpnUserCmd.java
@@ -36,7 +36,7 @@ import com.cloud.user.UserContext;
 public class AddVpnUserCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(AddVpnUserCmd.class.getName());
 
-    private static final String s_name = "addvpnuserresponse";
+    private static final String s_name = "vpnuser";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -97,7 +97,7 @@ public class AddVpnUserCmd extends BaseAsyncCmd {
     	VpnUserVO vpnUser = (VpnUserVO)getResponseObject();
         VpnUsersResponse vpnResponse = new VpnUsersResponse();
         vpnResponse.setId(vpnUser.getId());
-        vpnResponse.setUsername(vpnUser.getUsername());
+        vpnResponse.setUserName(vpnUser.getUsername());
         vpnResponse.setAccountName(vpnUser.getAccountName());
         
         Account accountTemp = ApiDBUtils.findAccountById(vpnUser.getAccountId());
diff --git a/server/src/com/cloud/api/commands/ListVpnUsersCmd.java b/server/src/com/cloud/api/commands/ListVpnUsersCmd.java
index a2f9f767744..07c9fdddca5 100644
--- a/server/src/com/cloud/api/commands/ListVpnUsersCmd.java
+++ b/server/src/com/cloud/api/commands/ListVpnUsersCmd.java
@@ -92,7 +92,7 @@ public class ListVpnUsersCmd extends BaseListCmd {
         for (VpnUserVO vpnUser : vpnUsers) {
         	VpnUsersResponse vpnResponse = new VpnUsersResponse();
             vpnResponse.setId(vpnUser.getId());
-            vpnResponse.setUsername(vpnUser.getUsername());
+            vpnResponse.setUserName(vpnUser.getUsername());
             vpnResponse.setAccountName(vpnUser.getAccountName());
             
             Account accountTemp = ApiDBUtils.findAccountById(vpnUser.getAccountId());
diff --git a/server/src/com/cloud/api/response/VpnUsersResponse.java b/server/src/com/cloud/api/response/VpnUsersResponse.java
index b87637a4b4a..a7b052615e9 100644
--- a/server/src/com/cloud/api/response/VpnUsersResponse.java
+++ b/server/src/com/cloud/api/response/VpnUsersResponse.java
@@ -48,11 +48,11 @@ public class VpnUsersResponse extends BaseResponse {
 		this.id = id;
 	}
 
-	public String getUsername() {
+	public String getUserName() {
 		return userName;
 	}
 
-	public void setUsername(String name) {
+	public void setUserName(String name) {
 		this.userName = name;
 	}
 
@@ -78,5 +78,7 @@ public class VpnUsersResponse extends BaseResponse {
 		return domainName;
 	}
 
-    
+	public String toString() {
+    	return "id: " + getId() + ", username: " + getUserName() + ", account: " + getAccountName() + ", domainid: " + getDomainId();
+    }
 }
diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js
index dd110432dfa..a794d428219 100644
--- a/ui/scripts/cloud.core.ipaddress.js
+++ b/ui/scripts/cloud.core.ipaddress.js
@@ -512,7 +512,7 @@ function showVpnUsers() {
 																																		 
 											if (result.jobstatus == 1) { // Succeeded 	
 												$thisDialog.dialog("close");
-												$("#tab_content_vpn #grid_content").append(vpnUserJsonToTemplate(result.jobresult.addvpnuserresponse).fadeIn());
+												$("#tab_content_vpn #grid_content").append(vpnUserJsonToTemplate(result.jobresult.vpnuser).fadeIn());
 											} else if (result.jobstatus == 2) { // Failed	
 												var errorMsg = "We were unable to add user access to your VPN.  Please contact support.";
 												$thisDialog.find("#info_container").text(errorMsg).show();