diff --git a/include/common/tmsg.h b/include/common/tmsg.h
index bdb6181884..f224f6d94c 100644
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -363,7 +363,7 @@ typedef struct {
   int8_t createType;
   int8_t superUser;  // denote if it is a super user or not
   char   user[TSDB_USER_LEN];
-  char   pass[TSDB_PASSWORD_LEN];
+  char   pass[TSDB_USET_PASSWORD_LEN];
 } SCreateUserReq;
 
 int32_t tSerializeSCreateUserReq(void* buf, int32_t bufLen, SCreateUserReq* pReq);
@@ -373,7 +373,7 @@ typedef struct {
   int8_t alterType;
   int8_t superUser;
   char   user[TSDB_USER_LEN];
-  char   pass[TSDB_PASSWORD_LEN];
+  char   pass[TSDB_USET_PASSWORD_LEN];
   char   dbname[TSDB_DB_FNAME_LEN];
 } SAlterUserReq;
 
diff --git a/source/dnode/mnode/impl/src/mndUser.c b/source/dnode/mnode/impl/src/mndUser.c
index 7d3f755cd7..469805387f 100644
--- a/source/dnode/mnode/impl/src/mndUser.c
+++ b/source/dnode/mnode/impl/src/mndUser.c
@@ -87,12 +87,6 @@ static int32_t mndCreateDefaultUsers(SMnode *pMnode) {
     return -1;
   }
 
-#if 0
-  if (mndCreateDefaultUser(pMnode, TSDB_DEFAULT_USER, "_" TSDB_DEFAULT_USER, TSDB_DEFAULT_PASS) != 0) {
-    return -1;
-  }
-#endif
-
   return 0;
 }