1 files changed, 6 insertions, 0 deletions
diff --git a/pki/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java b/pki/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java
index 298fd43c3..c807d5f83 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java
+++ b/pki/base/common/src/com/netscape/cms/authentication/TokenAuthentication.java
@@ -192,6 +192,12 @@ public class TokenAuthentication implements IAuthManager,
                 authToken.set(TOKEN_UID, uid);
                 authToken.set(TOKEN_GID, gid);
 
+                if(context != null)  {
+                    CMS.debug("SessionContext.USER_ID " + uid + " SessionContext.GROUP_ID " + gid);
+                    context.put(SessionContext.USER_ID,  uid );
+                    context.put(SessionContext.GROUP_ID, gid );
+                }
+
                 CMS.debug("TokenAuthentication: authenticated uid="+uid+", gid="+gid);
             } catch (EBaseException e) {
                 throw e;