diff --git a/user_channel/channel_layer.hpp b/user_channel/channel_layer.hpp
index bddd6b5..42e5b5e 100644
--- a/user_channel/channel_layer.hpp
+++ b/user_channel/channel_layer.hpp
@@ -14,6 +14,8 @@
 // limitations under the License.
 */
 #pragma once
+#include <openssl/crypto.h>
+
 #include <array>
 #include <ipmid/api.hpp>
 #include <string>
diff --git a/user_channel/passwd_mgr.cpp b/user_channel/passwd_mgr.cpp
index b2d32e8..63a226e 100644
--- a/user_channel/passwd_mgr.cpp
+++ b/user_channel/passwd_mgr.cpp
@@ -260,6 +260,8 @@
 
     // Update the timestamp
     fileLastUpdatedTime = getUpdatedFileTime();
+    // Clear sensitive data
+    OPENSSL_cleanse(dataBuf.data(), dataBuf.size());
     return;
 }
 
diff --git a/user_channel/user_mgmt.cpp b/user_channel/user_mgmt.cpp
index e1e21c9..04eb2f9 100644
--- a/user_channel/user_mgmt.cpp
+++ b/user_channel/user_mgmt.cpp
@@ -737,6 +737,8 @@
                   maxIpmi20PasswordSize);
 
     int retval = pamUpdatePasswd(userName.c_str(), passwd.c_str());
+    // Clear sensitive data
+    OPENSSL_cleanse(&passwd, passwd.length());
 
     switch (retval)
     {
diff --git a/user_channel/usercommands.cpp b/user_channel/usercommands.cpp
index bda4027..622857c 100644
--- a/user_channel/usercommands.cpp
+++ b/user_channel/usercommands.cpp
@@ -413,9 +413,17 @@
         {
             log<level::DEBUG>("Test password failed",
                               entry("USER-ID=%d", (uint8_t)req->userId));
+            // Clear sensitive data
+            OPENSSL_cleanse(&testPassword, testPassword.length());
+            OPENSSL_cleanse(&password, password.length());
+
             return static_cast<Cc>(
                 IPMISetPasswordReturnCodes::ipmiCCPasswdFailMismatch);
         }
+        // Clear sensitive data
+        OPENSSL_cleanse(&testPassword, testPassword.length());
+        OPENSSL_cleanse(&password, password.length());
+
         return ccSuccess;
     }
     return ccInvalidFieldRequest;