diff --git a/src/bin/initdb/initdb.cpp b/src/bin/initdb/initdb.cpp
index 02361f49b..9f80c3813 100644
--- a/src/bin/initdb/initdb.cpp
+++ b/src/bin/initdb/initdb.cpp
@@ -1956,6 +1956,9 @@ static void get_set_pwd(void)
             pwdbuf[--i] = '\0';
 
         pwd1 = xstrdup(pwdbuf);
+        if (!CheckInitialPasswd(username, pwd1)) {
+            exit_nicely();
+        }
 
     } else if (pwprompt) {
         /* else get password from readline */