diff --git a/user_channel/user_layer.hpp b/user_channel/user_layer.hpp
index 0639474..01b6634 100644
--- a/user_channel/user_layer.hpp
+++ b/user_channel/user_layer.hpp
@@ -135,13 +135,10 @@
 uint8_t ipmiUserGetUserId(const std::string& userName);
 
 /** @brief set's user name
- *
- *  @param[in] userId - user id
- *  @param[in] userName - user name
- *
- *  @return ccSuccess for success, others for failure.
+ *  This API is deprecated
  */
-Cc ipmiUserSetUserName(const uint8_t userId, const char* userName);
+Cc ipmiUserSetUserName(const uint8_t userId, const char* userName)
+    __attribute__((deprecated));
 
 /** @brief set's user name
  *
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