diff --git a/components/apimgt/org.wso2.carbon.apimgt.usage/org.wso2.carbon.apimgt.usage.client/src/main/java/org/wso2/carbon/apimgt/usage/client/impl/APIUsageStatisticsRestClientImpl.java b/components/apimgt/org.wso2.carbon.apimgt.usage/org.wso2.carbon.apimgt.usage.client/src/main/java/org/wso2/carbon/apimgt/usage/client/impl/APIUsageStatisticsRestClientImpl.java
index def69a0bf9fd..704dd5390d46 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.usage/org.wso2.carbon.apimgt.usage.client/src/main/java/org/wso2/carbon/apimgt/usage/client/impl/APIUsageStatisticsRestClientImpl.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.usage/org.wso2.carbon.apimgt.usage.client/src/main/java/org/wso2/carbon/apimgt/usage/client/impl/APIUsageStatisticsRestClientImpl.java
@@ -773,6 +773,9 @@ public List<APIUsageDTO> getProviderAPIUsage(String providerName, String fromDat
             throws APIMgtUsageQueryServiceClientException {
 
         String tenantDomain = MultitenantUtils.getTenantDomain(providerName);
+        if (providerName.contains(APIUsageStatisticsClientConstants.ALL_PROVIDERS)) {
+            providerName = APIUsageStatisticsClientConstants.ALL_PROVIDERS;
+        }
         Collection<APIUsage> usageData = getAPIUsageData(APIUsageStatisticsClientConstants.API_VERSION_PER_APP_AGG,
                 tenantDomain, fromDate, toDate);
         List<API> providerAPIs = getAPIsByProvider(providerName);
@@ -922,6 +925,9 @@ public List<APIResourcePathUsageDTO> getAPIUsageByResourcePath(String providerNa
         Collection<APIUsageByResourcePath> usageData = this
                 .getAPIUsageByResourcePathData(APIUsageStatisticsClientConstants.API_RESOURCE_PATH_PER_APP_AGG,
                         providerName, fromDate, toDate);
+        if (providerName.contains(APIUsageStatisticsClientConstants.ALL_PROVIDERS)) {
+            providerName = APIUsageStatisticsClientConstants.ALL_PROVIDERS;
+        }
         List<API> providerAPIs = getAPIsByProvider(providerName);
         List<APIResourcePathUsageDTO> usageByResourcePath = new ArrayList<APIResourcePathUsageDTO>();
         for (APIUsageByResourcePath usage : usageData) {
@@ -960,6 +966,9 @@ public List<APIDestinationUsageDTO> getAPIUsageByDestination(String providerName
         List<APIUsageByDestination> usageData = this
                 .getAPIUsageByDestinationData(APIUsageStatisticsClientConstants.API_PER_DESTINATION_AGG, providerName,
                         fromDate, toDate);
+        if (providerName.contains(APIUsageStatisticsClientConstants.ALL_PROVIDERS)) {
+            providerName = APIUsageStatisticsClientConstants.ALL_PROVIDERS;
+        }
         List<API> providerAPIs = getAPIsByProvider(providerName);
         List<APIDestinationUsageDTO> usageByDestination = new ArrayList<APIDestinationUsageDTO>();
 
@@ -1190,10 +1199,14 @@ public List<PerUserAPIUsageDTO> getUsageBySubscribers(String providerName, Strin
     @Override
     public List<APIResponseFaultCountDTO> getAPIResponseFaultCount(String providerName, String fromDate, String toDate)
             throws APIMgtUsageQueryServiceClientException {
-        String tenantDomain = MultitenantUtils.getTenantDomain(providerName);
+        String tenantAwareProviderName = providerName;
+        String tenantDomain = MultitenantUtils.getTenantDomain(tenantAwareProviderName);
+        if (providerName.contains(APIUsageStatisticsClientConstants.ALL_PROVIDERS)) {
+            providerName = APIUsageStatisticsClientConstants.ALL_PROVIDERS;
+        }
         List<APIResponseFaultCount> faultyData = this
-                .getAPIResponseFaultCountData(APIUsageStatisticsClientConstants.API_FAULTY_INVOCATION_AGG, tenantDomain, fromDate,
-                        toDate);
+                .getAPIResponseFaultCountData(APIUsageStatisticsClientConstants.API_FAULTY_INVOCATION_AGG, tenantDomain,
+                        fromDate, toDate);
         List<API> providerAPIs = getAPIsByProvider(providerName);
         List<APIResponseFaultCountDTO> faultyCount = new ArrayList<APIResponseFaultCountDTO>();
         List<APIVersionUsageDTO> apiVersionUsageList;
@@ -1208,7 +1221,8 @@ public List<APIResponseFaultCountDTO> getAPIResponseFaultCount(String providerNa
                     faultyDTO.setVersion(fault.getApiVersion());
                     faultyDTO.setContext(fault.getContext());
                     faultyDTO.setCount(fault.getFaultCount());
-                    apiVersionUsageList = getUsageByAPIVersions(providerName, fault.getApiName(), fromDate, toDate);
+                    apiVersionUsageList = getUsageByAPIVersions(tenantAwareProviderName, fault.getApiName(), fromDate,
+                            toDate);
                     for (APIVersionUsageDTO apiVersionUsageDTO : apiVersionUsageList) {
                         if (apiVersionUsageDTO.getVersion().equals(fault.getApiVersion())) {
                             long requestCount = apiVersionUsageDTO.getCount();
diff --git a/features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/publisher/site/blocks/stats/api-usage-destination/ajax/stats.jag b/features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/publisher/site/blocks/stats/api-usage-destination/ajax/stats.jag
index d1a7d44e2c4c..d7429d1f19ed 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/publisher/site/blocks/stats/api-usage-destination/ajax/stats.jag
+++ b/features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/publisher/site/blocks/stats/api-usage-destination/ajax/stats.jag
@@ -25,6 +25,15 @@ include("/jagg/jagg.jag");
             var apiFilter = request.getParameter("apiFilter");
             
             if (currentLocation.indexOf("all-statistics") >= 0 && (!apiFilter || (apiFilter != "myAPIs"))) {
+                var splitValues = provider.split("@");
+                var MultitenantUtils = Packages.org.wso2.carbon.utils.multitenancy.MultitenantUtils;
+                if (currentLocation != null && currentLocation.indexOf("all-statistics") >= 0 && (!apiFilter || (apiFilter != "myAPIs"))) {
+                    if (MultitenantUtils.isEmailUserName() && 3 <= splitValues.length) { //email-username
+                        allProviders = allProviders + "@" + splitValues[1] + "@" +  MultitenantUtils.getTenantDomain(provider);
+                    } else {
+                        allProviders = allProviders + '@' + MultitenantUtils.getTenantDomain(provider);
+                    }
+                }
                 result = mod.getAPIUsageByDestination(allProviders, from, to);
             } else {
                 result = mod.getAPIUsageByDestination(provider, from, to);
diff --git a/features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/publisher/site/blocks/stats/api-usage-resource-path/ajax/stats.jag b/features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/publisher/site/blocks/stats/api-usage-resource-path/ajax/stats.jag
index 1b69c741d0c8..6cc91d044388 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/publisher/site/blocks/stats/api-usage-resource-path/ajax/stats.jag
+++ b/features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/publisher/site/blocks/stats/api-usage-resource-path/ajax/stats.jag
@@ -23,6 +23,15 @@ include("/jagg/jagg.jag");
             var apiFilter = request.getParameter("apiFilter");
             
             if (currentLocation.indexOf("all-statistics") >= 0 && (!apiFilter || (apiFilter != "myAPIs"))) {
+                var splitValues = provider.split("@");
+                var MultitenantUtils = Packages.org.wso2.carbon.utils.multitenancy.MultitenantUtils;
+                if (currentLocation != null && currentLocation.indexOf("all-statistics") >= 0 && (!apiFilter || (apiFilter != "myAPIs"))) {
+                    if (MultitenantUtils.isEmailUserName() && 3 <= splitValues.length) { //email-username
+                        allProviders = allProviders + "@" + splitValues[1] + "@" +  MultitenantUtils.getTenantDomain(provider);
+                    } else {
+                        allProviders = allProviders + '@' + MultitenantUtils.getTenantDomain(provider);
+                    }
+                }
                 result = mod.getAPIUsageByResourcePath(allProviders, from, to);
             } else {
                 result = mod.getAPIUsageByResourcePath(provider, from, to);
diff --git a/features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/publisher/site/blocks/stats/api-usage/ajax/stats.jag b/features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/publisher/site/blocks/stats/api-usage/ajax/stats.jag
index 77ad6b67d645..71180d66da81 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/publisher/site/blocks/stats/api-usage/ajax/stats.jag
+++ b/features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/publisher/site/blocks/stats/api-usage/ajax/stats.jag
@@ -23,6 +23,15 @@ include("/jagg/jagg.jag");
             var apiFilter = request.getParameter("apiFilter");
             
             if (currentLocation.indexOf("all-statistics") >= 0 && (!apiFilter || (apiFilter != "myAPIs"))) {
+                var splitValues = provider.split("@");
+                var MultitenantUtils = Packages.org.wso2.carbon.utils.multitenancy.MultitenantUtils;
+                if (currentLocation != null && currentLocation.indexOf("all-statistics") >= 0 && (!apiFilter || (apiFilter != "myAPIs"))) {
+                    if (MultitenantUtils.isEmailUserName() && 3 <= splitValues.length) { //email-username
+                        allProviders = allProviders + "@" + splitValues[1] + "@" +  MultitenantUtils.getTenantDomain(provider);
+                    } else {
+                        allProviders = allProviders + '@' + MultitenantUtils.getTenantDomain(provider);
+                    }
+                }
                 result = mod.getProviderAPIUsage(allProviders, from, to);
             } else {
                 result = mod.getProviderAPIUsage(provider, from, to);
diff --git a/features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/publisher/site/blocks/stats/faulty-invocations/ajax/stats.jag b/features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/publisher/site/blocks/stats/faulty-invocations/ajax/stats.jag
index 4b72be7165bd..d07c5e563f4b 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/publisher/site/blocks/stats/faulty-invocations/ajax/stats.jag
+++ b/features/apimgt/org.wso2.carbon.apimgt.publisher.feature/src/main/resources/publisher/site/blocks/stats/faulty-invocations/ajax/stats.jag
@@ -25,6 +25,15 @@ include("/jagg/jagg.jag");
             var apiFilter = request.getParameter("apiFilter");
             
             if (currentLocation.indexOf("all-statistics") >= 0  && (!apiFilter || (apiFilter != "myAPIs"))) {
+                var splitValues = provider.split("@");
+                var MultitenantUtils = Packages.org.wso2.carbon.utils.multitenancy.MultitenantUtils;
+                if (currentLocation != null && currentLocation.indexOf("all-statistics") >= 0 && (!apiFilter || (apiFilter != "myAPIs"))) {
+                    if (MultitenantUtils.isEmailUserName() && 3 <= splitValues.length) { //email-username
+                        allProviders = allProviders + "@" + splitValues[1] + "@" +  MultitenantUtils.getTenantDomain(provider);
+                    } else {
+                        allProviders = allProviders + '@' + MultitenantUtils.getTenantDomain(provider);
+                    }
+                }
                 result = mod.getAPIResponseFaultCount(allProviders, from, to);
             } else {
                 result = mod.getAPIResponseFaultCount(provider, from, to);