diff --git a/bin/v-change-database-password-for-all-wordpress b/bin/v-change-database-password-for-all-wordpress
index ad922cc2..e129497c 100644
--- a/bin/v-change-database-password-for-all-wordpress
+++ b/bin/v-change-database-password-for-all-wordpress
@@ -19,6 +19,8 @@ source $VESTA/func/main.sh
 #                       Action                             #
 #----------------------------------------------------------#
 
+touch /root/remember-db-user-pass.txt
+
 for user in $(grep '@' /etc/passwd |cut -f1 -d:); do
     if [ ! -f "/usr/local/vesta/data/users/$user/user.conf" ]; then
         continue;
@@ -33,6 +35,9 @@ for user in $(grep '@' /etc/passwd |cut -f1 -d:); do
 
 done
 
+# cat /root/remember-db-user-pass.txt
+rm /root/remember-db-user-pass.txt
+
 #----------------------------------------------------------#
 #                       Vesta                              #
 #----------------------------------------------------------#
diff --git a/bin/v-change-database-password-for-wordpress b/bin/v-change-database-password-for-wordpress
index e318edde..dd7a3a91 100644
--- a/bin/v-change-database-password-for-wordpress
+++ b/bin/v-change-database-password-for-wordpress
@@ -69,10 +69,28 @@ if [ -f "/home/$user/web/$domain/public_html/wp-config.php" ]; then
         chown $user:$user $wp_config_path
     fi
     db_name=$(grep "DB_NAME" $wp_config_path | grep -oP "define\s*\(\s*'DB_NAME'\s*,\s*'\K[^']+")
-    new_password=$(generate_password)
+    db_user=$(grep "DB_USER" $wp_config_path | grep -oP "define\s*\(\s*'DB_USER'\s*,\s*'\K[^']+")
+    new_password=''
+    found_existing_password=0
+    if [ -f "/root/remember-db-user-pass.txt" ]; then
+        db_user_pass=$(grep "$db_user:" /root/remember-db-user-pass.txt)
+        if [ -n "$db_user_pass" ]; then
+            new_password=$(echo "$db_user_pass" | cut -d':' -f2)
+            echo "= Using existing password for $db_user"
+            found_existing_password=1
+        fi
+    fi
+
+    if [ -z "$new_password" ]; then
+        new_password=$(generate_password)
+    fi
+
     echo "DB name: $db_name"
+    echo "DB user: $db_user"
     echo "New DB password: $new_password"
-    # echo "executing: /usr/local/vesta/bin/v-change-database-password \"$user\" \"$db_name\" \"$new_password\""
+    if [ $found_existing_password -eq 0 ] && [ -f "/root/remember-db-user-pass.txt" ]; then
+        echo "$db_user:$new_password" >> /root/remember-db-user-pass.txt
+    fi
     /usr/local/vesta/bin/v-change-database-password "$user" "$db_name" "$new_password"
     if [ $? -ne 0 ]; then
         echo "*************** ERROR: Failed to change database password ***************"