diff --git a/api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java b/api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
index cc9331bd4f7..0b5e69d8c0d 100644
--- a/api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
+++ b/api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
@@ -37,7 +37,7 @@ public class ListVpnConnectionsCmd extends BaseListProjectAndAccountResourcesCmd
     /////////////////////////////////////////////////////
 
     @IdentityMapper(entityTableName="s2s_vpn_connection")
-    @Parameter(name=ApiConstants.ID, type=CommandType.LONG, required=true, description="id of the vpn connection")
+    @Parameter(name=ApiConstants.ID, type=CommandType.LONG, description="id of the vpn connection")
     private Long id;
 
     /////////////////////////////////////////////////////
diff --git a/api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java b/api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java
index 335183497c2..9f5a14306b3 100644
--- a/api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java
+++ b/api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java
@@ -37,7 +37,7 @@ public class ListVpnCustomerGatewaysCmd extends BaseListProjectAndAccountResourc
     /////////////////////////////////////////////////////
 
     @IdentityMapper(entityTableName="s2s_customer_gateway")
-    @Parameter(name=ApiConstants.ID, type=CommandType.LONG, required=true, description="id of the customer gateway")
+    @Parameter(name=ApiConstants.ID, type=CommandType.LONG, description="id of the customer gateway")
     private Long id;
 
     /////////////////////////////////////////////////////
diff --git a/api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java b/api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java
index b72b1bb1eb9..46d5d7dcffc 100644
--- a/api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java
+++ b/api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java
@@ -37,7 +37,7 @@ public class ListVpnGatewaysCmd extends BaseListProjectAndAccountResourcesCmd {
     /////////////////////////////////////////////////////
 
     @IdentityMapper(entityTableName="s2s_vpn_gateway")
-    @Parameter(name=ApiConstants.ID, type=CommandType.LONG, required=true, description="id of the vpn gateway")
+    @Parameter(name=ApiConstants.ID, type=CommandType.LONG, description="id of the vpn gateway")
     private Long id;
 
     /////////////////////////////////////////////////////
diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
index bc634efaff7..eca1d807cd4 100644
--- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
@@ -306,6 +306,8 @@ public class Site2SiteVpnManagerImpl implements Site2SiteVpnService, Manager {
         List<Site2SiteCustomerGateway> results = new ArrayList<Site2SiteCustomerGateway>();
         if (id != null) {
             results.add(_customerGatewayDao.findById(cmd.getId()));
+        } else {
+            results.addAll(_customerGatewayDao.listAll());
         }
         return results;
     }
@@ -316,6 +318,8 @@ public class Site2SiteVpnManagerImpl implements Site2SiteVpnService, Manager {
         List<Site2SiteVpnGateway> results = new ArrayList<Site2SiteVpnGateway>();
         if (id != null) {
             results.add(_vpnGatewayDao.findById(cmd.getId()));
+        } else {
+            results.addAll(_vpnGatewayDao.listAll());
         }
         return results;
     }
@@ -326,6 +330,8 @@ public class Site2SiteVpnManagerImpl implements Site2SiteVpnService, Manager {
         List<Site2SiteVpnConnection> results = new ArrayList<Site2SiteVpnConnection>();
         if (id != null) {
             results.add(_vpnConnectionDao.findById(cmd.getId()));
+        } else {
+            results.addAll(_vpnConnectionDao.listAll());
         }
         return results;
     }