diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/util/OAuth2Util.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/util/OAuth2Util.java
index e210a550cd..83060770fe 100644
--- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/util/OAuth2Util.java
+++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/util/OAuth2Util.java
@@ -4100,10 +4100,10 @@ public static AuthenticatedUser createAuthenticatedUser(AuthenticatedUser authzU
             }
         }
         if (StringUtils.isNotEmpty(authzUser.getAccessingOrganization())) {
-            authzUser.setAccessingOrganization(authzUser.getAccessingOrganization());
-            authzUser.setUserResidentOrganization(authzUser.getUserResidentOrganization());
+            authenticatedUser.setAccessingOrganization(authzUser.getAccessingOrganization());
+            authenticatedUser.setUserResidentOrganization(authzUser.getUserResidentOrganization());
             // Update user tenant domain.
-            authzUser.setTenantDomain(authzUser.getTenantDomain());
+            authenticatedUser.setTenantDomain(authzUser.getTenantDomain());
         }
         return authenticatedUser;
     }