diff --git a/test/user_mgr_test.cpp b/test/user_mgr_test.cpp
index f07b00c..9dd799a 100644
--- a/test/user_mgr_test.cpp
+++ b/test/user_mgr_test.cpp
@@ -558,7 +558,7 @@
     UserMgrInTest,
     ThrowForUserNameConstraintsExceedSystemMaxUserNameLenThrowsInvalidArgument)
 {
-    std::string strWith31Chars(31, 'A');
+    std::string strWith31Chars(101, 'A');
     EXPECT_THROW(
         throwForUserNameConstraints(strWith31Chars, {}),
         sdbusplus::xyz::openbmc_project::Common::Error::InvalidArgument);
diff --git a/user_mgr.cpp b/user_mgr.cpp
index 129e4b4..b7afd16 100644
--- a/user_mgr.cpp
+++ b/user_mgr.cpp
@@ -55,7 +55,7 @@
 
 static constexpr const char* passwdFileName = "/etc/passwd";
 static constexpr size_t ipmiMaxUserNameLen = 16;
-static constexpr size_t systemMaxUserNameLen = 30;
+static constexpr size_t systemMaxUserNameLen = 100;
 static constexpr const char* grpSsh = "ssh";
 static constexpr int success = 0;
 static constexpr int failure = -1;