diff --git a/bin/v-add-wordpress-admin b/bin/v-add-wordpress-admin
index 3814e51a..67f58bf4 100644
--- a/bin/v-add-wordpress-admin
+++ b/bin/v-add-wordpress-admin
@@ -12,6 +12,11 @@ if [ "$whoami" != "root" ]; then
     exit 1
 fi
 
+if [ "$#" -lt 4 ]; then
+    echo "Usage: v-add-wordpress-admin [DOMAIN] [USERNAME] [PASSWORD] [EMAIL]"
+    exit 1
+fi
+
 # Importing system environment
 source /etc/profile
 
diff --git a/bin/v-change-wordpress-admin-passwords b/bin/v-change-wordpress-admin-passwords
index 591ff27c..ba3dec2b 100644
--- a/bin/v-change-wordpress-admin-passwords
+++ b/bin/v-change-wordpress-admin-passwords
@@ -106,7 +106,7 @@ while IFS=',' read -r ID LOGIN EMAIL; do
                         echo "Invalid username. Please choose one of: ${OTHER_USERS[*]}"
                     done
                     # delete by username, reassign by username
-                    RUN="$WP_RUN user delete $LOGIN --reassign=$REASSIGN --yes --skip-plugins --skip-themes"
+                    RUN="$WP_RUN user delete $ID --reassign=$REASSIGN --yes --skip-plugins --skip-themes"
                     eval "$RUN"
                     if [ $? -eq 0 ]; then
                         echo "$TARGET deleted (content reassigned to $REASSIGN)."
@@ -121,7 +121,7 @@ while IFS=',' read -r ID LOGIN EMAIL; do
                 ;;
             [Cc]* )
                 NEW_PASS=$(gen_pass)
-                RUN="$WP_RUN user update $LOGIN --user_pass=$NEW_PASS --skip-plugins --skip-themes"
+                RUN="$WP_RUN user update $ID --user_pass=$NEW_PASS --skip-plugins --skip-themes"
                 eval "$RUN"
                 if [ $? -eq 0 ]; then
                     echo "Password for username '$TARGET' changed to: $NEW_PASS"
@@ -147,6 +147,18 @@ while IFS=',' read -r ID LOGIN EMAIL; do
     done
 done <<< "$ADMIN_LIST_CSV"
 
+if [ -f /home/$USER/web/$DOMAIN/wp-admin-password-change.txt ]; then
+    echo "-------------------------------------"
+    echo
+    read -r -p "Do you want to save the new passwords to a file /home/$USER/web/$DOMAIN/wp-admin-password-change.txt ? (y/n, default: n) " SAVE_PASSWORDS < /dev/tty
+    if [ -z "$SAVE_PASSWORDS" ]; then
+        SAVE_PASSWORDS="n"
+    fi
+    if [[ $SAVE_PASSWORDS =~ ^[Nn]$ ]]; then
+        rm /home/$USER/web/$DOMAIN/wp-admin-password-change.txt
+    fi
+fi
+
 #----------------------------------------------------------#
 #        flush cache and refresh all security salts        #
 #----------------------------------------------------------#