diff --git a/src/oemcommands.cpp b/src/oemcommands.cpp
index 107a1fe..bf23241 100644
--- a/src/oemcommands.cpp
+++ b/src/oemcommands.cpp
@@ -1096,7 +1096,10 @@
 
     // ipmiUserSetUserName correctly handles char*, possibly non-null
     // terminated strings using ipmiMaxUserName size
-    auto userNameRaw = reinterpret_cast<const char*>(userName.data());
+    size_t nameLen = strnlen(reinterpret_cast<const char*>(userName.data()),
+                             sizeof(userName));
+    const std::string userNameRaw(
+        reinterpret_cast<const char*>(userName.data()), nameLen);
 
     if (ipmi::ccSuccess == ipmiUserSetUserName(ipmiDefaultUserId, userNameRaw))
     {
@@ -1118,7 +1121,7 @@
         }
         // we need to delete  the default user id which added in this command as
         // password / priv setting is failed.
-        ipmiUserSetUserName(ipmiDefaultUserId, "");
+        ipmiUserSetUserName(ipmiDefaultUserId, static_cast<std::string>(""));
         phosphor::logging::log<phosphor::logging::level::ERR>(
             "ipmiOEMSetUser2Activation: password / priv setting is failed.");
     }