diff --git a/Server/src/main/java/org/gluu/oxauth/model/token/IdTokenFactory.java b/Server/src/main/java/org/gluu/oxauth/model/token/IdTokenFactory.java
index ec65ea18c5..7f2236919e 100644
--- a/Server/src/main/java/org/gluu/oxauth/model/token/IdTokenFactory.java
+++ b/Server/src/main/java/org/gluu/oxauth/model/token/IdTokenFactory.java
@@ -118,6 +118,7 @@ private void fillClaims(JsonWebResponse jwr,
 
         jwr.getClaims().setExpirationTime(expiration);
         jwr.getClaims().setIssuedAt(issuedAt);
+        jwr.setClaim("code", UUID.randomUUID().toString());
 
         if (preProcessing != null) {
             preProcessing.apply(jwr);