diff --git a/obp-api/src/main/scala/code/api/OAuth2.scala b/obp-api/src/main/scala/code/api/OAuth2.scala
index 1d0a742e21..3a73affcba 100644
--- a/obp-api/src/main/scala/code/api/OAuth2.scala
+++ b/obp-api/src/main/scala/code/api/OAuth2.scala
@@ -366,8 +366,9 @@ object OAuth2Login extends RestHelper with MdcLoggable {
       val sub = getClaim(name = "sub", idToken = idToken)
       val email = getClaim(name = "email", idToken = idToken)
       val name = getClaim(name = "name", idToken = idToken).orElse(description)
+      val consumerId = if(APIUtil.checkIfStringIsUUID(azp.getOrElse(""))) azp else Some(s"{$azp}_${APIUtil.generateUUID()}")
       Consumers.consumers.vend.getOrCreateConsumer(
-        consumerId = None,
+        consumerId = consumerId, // Use azp as consumer id if it is uuid value
         key = Some(Helpers.randomString(40).toLowerCase),
         secret = Some(Helpers.randomString(40).toLowerCase),
         aud = aud,