diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 502cb36ad82..dde3ab09f04 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -766,12 +766,12 @@ VirtualMachineGuru<DomainRouterVO>, Listener {
         				List<? extends Nic> routerNics = _nicDao.listByVmId(router.getId());
         				for (Nic routerNic : routerNics) {
         					Network network = _networkMgr.getNetwork(routerNic.getNetworkId());
-        					if (network.getTrafficType() == TrafficType.Public) {
-        						boolean forVpc = router.getVpcId() != null;
+        					boolean forVpc = router.getVpcId() != null;
+        					if ((forVpc && network.getTrafficType() == TrafficType.Public) || (!forVpc && network.getTrafficType() == TrafficType.Guest)) {
         						final NetworkUsageCommand usageCmd = new NetworkUsageCommand(privateIP, router.getHostName(),
         								forVpc, routerNic.getIp4Address());
         						UserStatisticsVO previousStats = _statsDao.findBy(router.getAccountId(), 
-        								router.getDataCenterIdToDeployIn(), network.getId(), null, router.getId(), router.getType().toString());
+        								router.getDataCenterIdToDeployIn(), network.getId(), (forVpc ? routerNic.getIp4Address() : null), router.getId(), router.getType().toString());
         						NetworkUsageAnswer answer = null;
         						try {
         							answer = (NetworkUsageAnswer) _agentMgr.easySend(router.getHostId(), usageCmd);
@@ -793,7 +793,7 @@ VirtualMachineGuru<DomainRouterVO>, Listener {
         								}
         								txn.start();
         								UserStatisticsVO stats = _statsDao.lock(router.getAccountId(), 
-        										router.getDataCenterIdToDeployIn(), network.getId(), routerNic.getIp4Address(), router.getId(), router.getType().toString());
+        										router.getDataCenterIdToDeployIn(), network.getId(), (forVpc ? routerNic.getIp4Address() : null), router.getId(), router.getType().toString());
         								if (stats == null) {
         									s_logger.warn("unable to find stats for account: " + router.getAccountId());
         									continue;
@@ -3296,12 +3296,12 @@ VirtualMachineGuru<DomainRouterVO>, Listener {
     		List<? extends Nic> routerNics = _nicDao.listByVmId(router.getId());
     		for (Nic routerNic : routerNics) {
     			Network network = _networkMgr.getNetwork(routerNic.getNetworkId());
-    			if (network.getTrafficType() == TrafficType.Public) {
-    				boolean forVpc = router.getVpcId() != null;
+    			boolean forVpc = router.getVpcId() != null;
+    			if ((forVpc && network.getTrafficType() == TrafficType.Public) || (!forVpc && network.getTrafficType() == TrafficType.Guest)) {
     				final NetworkUsageCommand usageCmd = new NetworkUsageCommand(privateIP, router.getHostName(),
     						forVpc, routerNic.getIp4Address());
     				UserStatisticsVO previousStats = _statsDao.findBy(router.getAccountId(), 
-    						router.getDataCenterIdToDeployIn(), network.getId(), null, router.getId(), router.getType().toString());
+    						router.getDataCenterIdToDeployIn(), network.getId(), (forVpc ? routerNic.getIp4Address() : null), router.getId(), router.getType().toString());
     				NetworkUsageAnswer answer = null;
     				try {
     					answer = (NetworkUsageAnswer) _agentMgr.easySend(router.getHostId(), usageCmd);
@@ -3323,7 +3323,7 @@ VirtualMachineGuru<DomainRouterVO>, Listener {
     						}
     						txn.start();
     						UserStatisticsVO stats = _statsDao.lock(router.getAccountId(), 
-    								router.getDataCenterIdToDeployIn(), network.getId(), null, router.getId(), router.getType().toString());
+    								router.getDataCenterIdToDeployIn(), network.getId(), (forVpc ? routerNic.getIp4Address() : null), router.getId(), router.getType().toString());
     						if (stats == null) {
     							s_logger.warn("unable to find stats for account: " + router.getAccountId());
     							continue;
diff --git a/server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java b/server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
index b79f2258baf..d04aa210381 100755
--- a/server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
+++ b/server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
@@ -288,12 +288,14 @@ public class DomainRouterDaoImpl extends GenericDaoBase<DomainRouterVO, Long> im
                 RouterNetworkVO routerNtwkMap = new RouterNetworkVO(router.getId(), guestNetwork.getId(), guestNetwork.getGuestType());
                 _routerNetworkDao.persist(routerNtwkMap);
                 //2) create user stats entry for the network
-                UserStatisticsVO stats = _userStatsDao.findBy(router.getAccountId(), router.getDataCenterIdToDeployIn(), 
-                        guestNetwork.getId(), null, router.getId(), router.getType().toString());
-                if (stats == null) {
-                    stats = new UserStatisticsVO(router.getAccountId(), router.getDataCenterIdToDeployIn(), null, router.getId(),
-                            router.getType().toString(), guestNetwork.getId());
-                    _userStatsDao.persist(stats);
+                if(router.getVpcId() == null){
+                	UserStatisticsVO stats = _userStatsDao.findBy(router.getAccountId(), router.getDataCenterIdToDeployIn(), 
+                			guestNetwork.getId(), null, router.getId(), router.getType().toString());
+                	if (stats == null) {
+                		stats = new UserStatisticsVO(router.getAccountId(), router.getDataCenterIdToDeployIn(), null, router.getId(),
+                				router.getType().toString(), guestNetwork.getId());
+                		_userStatsDao.persist(stats);
+                	}
                 }
                 txn.commit();
             }