diff --git a/user_channel/user_mgmt.cpp b/user_channel/user_mgmt.cpp
index 8ba4a94..641abf0 100644
--- a/user_channel/user_mgmt.cpp
+++ b/user_channel/user_mgmt.cpp
@@ -769,12 +769,17 @@
 
     boost::interprocess::scoped_lock<boost::interprocess::named_recursive_mutex>
         userLock{*userMutex};
-    bool validUser = isValidUserName(userNameInChar);
     std::string oldUser;
     getUserName(userId, oldUser);
-    UserInfo* userInfo = getUserInfo(userId);
 
     std::string newUser(userNameInChar, 0, ipmiMaxUserName);
+    if (oldUser == newUser)
+    {
+        // requesting to set the same user name, return success.
+        return IPMI_CC_OK;
+    }
+    bool validUser = isValidUserName(userNameInChar);
+    UserInfo* userInfo = getUserInfo(userId);
     if (newUser.empty() && !oldUser.empty())
     {
         // Delete existing user