diff --git a/accounts.js b/accounts.js
index 6e44edf..6f5ec86 100644
--- a/accounts.js
+++ b/accounts.js
@@ -315,7 +315,7 @@ function create(app) {
         return {
           sub: account.accountId,
           aud: req.params.aud || req.body.aud || req.experienceId,
-          azp: req.params.azp || req.body.azp || req.experienceId,
+          azp: req.params.azp || req.body.azp || req.body.client_id || req.body.client_uri || req.experienceId,
         };
       });
     });
@@ -324,8 +324,8 @@ function create(app) {
     return require('./common').checkIsserToken(req, req.params.sub || req.body.sub).then(function (sub) {
       return {
         sub: sub,
-        aud: req.params.aud || req.body.aud,
-        azp: req.params.azp || req.body.azp,
+        aud: req.params.aud || req.body.aud || req.experienceId,
+        azp: req.params.azp || req.body.azp || req.body.client_id || req.body.client_uri,
         exp: req.oauth3.token.exp,
       };
     });