diff --git a/components/org.wso2.carbon.identity.notification.push.device.handler/src/main/java/org/wso2/carbon/identity/notification/push/device/handler/impl/DeviceHandlerServiceImpl.java b/components/org.wso2.carbon.identity.notification.push.device.handler/src/main/java/org/wso2/carbon/identity/notification/push/device/handler/impl/DeviceHandlerServiceImpl.java
index 45c5ca7..194edfa 100644
--- a/components/org.wso2.carbon.identity.notification.push.device.handler/src/main/java/org/wso2/carbon/identity/notification/push/device/handler/impl/DeviceHandlerServiceImpl.java
+++ b/components/org.wso2.carbon.identity.notification.push.device.handler/src/main/java/org/wso2/carbon/identity/notification/push/device/handler/impl/DeviceHandlerServiceImpl.java
@@ -275,10 +275,7 @@ private void resolveTenantAndOrganizationInfo(RegistrationDiscoveryData registra
                     .getOrganizationManager();
             String orgId = organizationManager.resolveOrganizationId(domainIdentifier);
             String organizationName = organizationManager.getOrganizationNameById(orgId);
-            String primaryOrgId = organizationManager.getPrimaryOrganizationId(orgId);
-            String primaryTenantDomain = organizationManager.resolveTenantDomain(primaryOrgId);
 
-            registrationDiscoveryData.setTenantDomain(primaryTenantDomain);
             registrationDiscoveryData.setOrganizationId(orgId);
             registrationDiscoveryData.setOrganizationName(organizationName);
         } else {
diff --git a/components/org.wso2.carbon.identity.notification.push.provider/src/main/java/org/wso2/carbon/identity/notification/push/provider/model/PushNotificationData.java b/components/org.wso2.carbon.identity.notification.push.provider/src/main/java/org/wso2/carbon/identity/notification/push/provider/model/PushNotificationData.java
index 984a01d..14b8b11 100644
--- a/components/org.wso2.carbon.identity.notification.push.provider/src/main/java/org/wso2/carbon/identity/notification/push/provider/model/PushNotificationData.java
+++ b/components/org.wso2.carbon.identity.notification.push.provider/src/main/java/org/wso2/carbon/identity/notification/push/provider/model/PushNotificationData.java
@@ -32,6 +32,8 @@ public class PushNotificationData {
     private final String deviceToken;
     private final String username;
     private final String tenantDomain;
+    private final String organizationId;
+    private final String organizationName;
     private final String userStoreDomain;
     private final String applicationName;
     private final String notificationScenario;
@@ -48,6 +50,8 @@ private PushNotificationData(Builder builder) {
         this.notificationBody = builder.notificationBody;
         this.username = builder.username;
         this.tenantDomain = builder.tenantDomain;
+        this.organizationId = builder.organizationId;
+        this.organizationName = builder.organizationName;
         this.userStoreDomain = builder.userStoreDomain;
         this.applicationName = builder.applicationName;
         this.notificationScenario = builder.notificationScenario;
@@ -81,6 +85,16 @@ public String getTenantDomain() {
         return tenantDomain;
     }
 
+    public String getOrganizationId() {
+
+        return organizationId;
+    }
+
+    public String getOrganizationName() {
+
+        return organizationName;
+    }
+
     public String getUserStoreDomain() {
 
         return userStoreDomain;
@@ -134,10 +148,15 @@ public String getDeviceOS() {
     public Map<String, String> getAdditionalData() {
 
         Map<String, String> additionalData = new HashMap<>();
+        boolean isOrganizationUser = organizationId != null && organizationName != null;
         if (username != null) {
             additionalData.put("username", username);
         }
-        if (tenantDomain != null) {
+        if (isOrganizationUser) {
+            additionalData.put("organizationId", organizationId);
+            additionalData.put("organizationName", organizationName);
+        }
+        if (tenantDomain != null && !isOrganizationUser) {
             additionalData.put("tenantDomain", tenantDomain);
         }
         if (userStoreDomain != null) {
@@ -184,6 +203,8 @@ public static class Builder {
         private String deviceId;
         private String username;
         private String tenantDomain;
+        private String organizationId;
+        private String organizationName;
         private String userStoreDomain;
         private String applicationName;
         private String notificationScenario;
@@ -218,6 +239,18 @@ public Builder setTenantDomain(String tenantDomain) {
             return this;
         }
 
+        public Builder setOrganizationId(String organizationId) {
+
+            this.organizationId = organizationId;
+            return this;
+        }
+
+        public Builder setOrganizationName(String organizationName) {
+
+            this.organizationName = organizationName;
+            return this;
+        }
+
         public Builder setUserStoreDomain(String userStoreDomain) {
 
             this.userStoreDomain = userStoreDomain;