diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java
index a8811e5418..854972b833 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java
@@ -97,7 +97,8 @@ public class GeoLocationBasedServiceImpl implements GeoLocationBasedService {
 
             // this is the user who initiates the request
             String authorizedUser = MultitenantUtils.getTenantAwareUsername(
-                    CarbonContext.getThreadLocalCarbonContext().getUsername());
+                    CarbonContext.getThreadLocalCarbonContext().getUsername() + "@" +
+                            CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
 
             try {
                 String tenantDomain = MultitenantUtils.getTenantDomain(authorizedUser);