diff --git a/user_channel/usercommands.cpp b/user_channel/usercommands.cpp
index 36c6ebc..bda4027 100644
--- a/user_channel/usercommands.cpp
+++ b/user_channel/usercommands.cpp
@@ -292,8 +292,12 @@
         return ccParmOutOfRange;
     }
 
-    return ipmiUserSetUserName(req->userId,
-                               reinterpret_cast<const char*>(req->userName));
+    size_t nameLen = strnlen(reinterpret_cast<const char*>(req->userName),
+                             sizeof(req->userName));
+    const std::string strUserName(reinterpret_cast<const char*>(req->userName),
+                                  nameLen);
+
+    return ipmiUserSetUserName(req->userId, strUserName);
 }
 
 /** @brief implementes the get user name command