diff --git a/lib/wsapi/session_context.js b/lib/wsapi/session_context.js
index 8b7f9e13d7a058f28192ae354cfe55b2a9e5b09b..c62ec790622de67d6681e8700db50db13308f8b5 100644
--- a/lib/wsapi/session_context.js
+++ b/lib/wsapi/session_context.js
@@ -50,6 +50,10 @@ exports.process = function(req, res) {
     if (config.get('enable_code_version')) {
       respObj.code_version = version();
     }
+    if (req.session && req.session.userid) {
+      respObj.userid = req.session.userid;
+    }
+
     res.json(respObj);
   };