diff --git a/include/sessions.hpp b/include/sessions.hpp
index 79b344a..94a0755 100644
--- a/include/sessions.hpp
+++ b/include/sessions.hpp
@@ -8,6 +8,7 @@
 #include <utils/ip_utils.hpp>
 
 #include <csignal>
+#include <optional>
 #include <random>
 #ifdef BMCWEB_ENABLE_IBM_MANAGEMENT_CONSOLE
 #include <ibm/locks.hpp>
@@ -33,7 +34,7 @@
     std::string sessionToken;
     std::string username;
     std::string csrfToken;
-    std::string clientId;
+    std::optional<std::string> clientId;
     std::string clientIp;
     std::chrono::time_point<std::chrono::steady_clock> lastUpdated;
     PersistenceType persistence{PersistenceType::TIMEOUT};
@@ -88,12 +89,10 @@
             {
                 userSession->username = *thisValue;
             }
-#ifdef BMCWEB_ENABLE_IBM_MANAGEMENT_CONSOLE
             else if (element.key() == "client_id")
             {
                 userSession->clientId = *thisValue;
             }
-#endif
             else if (element.key() == "client_ip")
             {
                 userSession->clientIp = *thisValue;
@@ -204,7 +203,7 @@
     std::shared_ptr<UserSession> generateUserSession(
         const std::string_view username,
         const boost::asio::ip::address& clientIp,
-        const std::string_view clientId,
+        const std::optional<std::string>& clientId,
         PersistenceType persistence = PersistenceType::TIMEOUT,
         bool isConfigureSelfOnly = false)
     {
@@ -255,8 +254,8 @@
         }
 
         auto session = std::make_shared<UserSession>(UserSession{
-            uniqueId, sessionToken, std::string(username), csrfToken,
-            std::string(clientId), redfish::ip_util::toString(clientIp),
+            uniqueId, sessionToken, std::string(username), csrfToken, clientId,
+            redfish::ip_util::toString(clientIp),
             std::chrono::steady_clock::now(), persistence, false,
             isConfigureSelfOnly});
         auto it = authTokens.emplace(sessionToken, session);