diff --git a/include/user_monitor.hpp b/include/user_monitor.hpp
new file mode 100644
index 0000000..bd8ed24
--- /dev/null
+++ b/include/user_monitor.hpp
@@ -0,0 +1,30 @@
+#pragma once
+#include "dbus_singleton.hpp"
+#include "dbus_utility.hpp"
+#include "persistent_data.hpp"
+
+#include <sdbusplus/bus/match.hpp>
+#include <sdbusplus/message/types.hpp>
+
+namespace bmcweb
+{
+
+inline void onUserRemoved(sdbusplus::message::message& msg)
+{
+    sdbusplus::message::object_path p;
+    msg.read(p);
+    std::string username = p.filename();
+    persistent_data::SessionStore::getInstance().removeSessionsByUsername(
+        username);
+}
+
+inline void registerUserRemovedSignal()
+{
+    std::string userRemovedMatchStr =
+        sdbusplus::bus::match::rules::interfacesRemoved(
+            "/xyz/openbmc_project/user");
+
+    static sdbusplus::bus::match_t userRemovedMatch(
+        *crow::connections::systemBus, userRemovedMatchStr, onUserRemoved);
+}
+} // namespace bmcweb