diff --git a/cyberpanel_upgrade_monolithic.sh b/cyberpanel_upgrade_monolithic.sh
index 0ef2f1526..34bbc5dfe 100644
--- a/cyberpanel_upgrade_monolithic.sh
+++ b/cyberpanel_upgrade_monolithic.sh
@@ -1813,6 +1813,13 @@ if [[ "$Server_Country" = "CN" ]] ; then
 fi
 
 sed -i 's|python2|python|g' /usr/bin/adminPass
+if [[ -f /usr/bin/adminPass ]]; then
+  cat >/usr/bin/adminPass <<'EOF'
+/usr/local/CyberPanel/bin/python /usr/local/CyberCP/plogical/adminPass.py --password "$@"
+systemctl restart lscpd
+echo "$@" > /etc/cyberpanel/adminPass
+EOF
+fi
 chmod 700 /usr/bin/adminPass
 
 rm -f /usr/bin/php
diff --git a/install/venvsetup_modules/04_after_install.sh b/install/venvsetup_modules/04_after_install.sh
index b14eb0e5d..1453cbe61 100644
--- a/install/venvsetup_modules/04_after_install.sh
+++ b/install/venvsetup_modules/04_after_install.sh
@@ -123,7 +123,7 @@ DISK2=$(df -h | awk '$NF=="/"{printf "%d/%dGB (%s)\n", $3,$2,$5}')
 ELAPSED="$(($SECONDS / 3600)) hrs $((($SECONDS / 60) % 60)) min $(($SECONDS % 60)) sec"
 MYSQLPASSWD=$(cat /etc/cyberpanel/mysqlPassword)
 echo "$ADMIN_PASS" > /etc/cyberpanel/adminPass
-/usr/local/CyberPanel/bin/python2 /usr/local/CyberCP/plogical/adminPass.py --password $ADMIN_PASS
+/usr/local/CyberPanel/bin/python2 /usr/local/CyberCP/plogical/adminPass.py --password "$ADMIN_PASS"
 _restart_lscpd_safe
 systemctl restart lsws
 echo "/usr/local/CyberPanel/bin/python2 /usr/local/CyberCP/plogical/adminPass.py --password \"\$@\"" > /usr/bin/adminPass
diff --git a/install/venvsetup_monolithic.sh b/install/venvsetup_monolithic.sh
index 8dbf7f4d0..088f84b8e 100644
--- a/install/venvsetup_monolithic.sh
+++ b/install/venvsetup_monolithic.sh
@@ -1153,7 +1153,7 @@ DISK2=$(df -h | awk '$NF=="/"{printf "%d/%dGB (%s)\n", $3,$2,$5}')
 ELAPSED="$(($SECONDS / 3600)) hrs $((($SECONDS / 60) % 60)) min $(($SECONDS % 60)) sec"
 MYSQLPASSWD=$(cat /etc/cyberpanel/mysqlPassword)
 echo "$ADMIN_PASS" > /etc/cyberpanel/adminPass
-/usr/local/CyberPanel/bin/python2 /usr/local/CyberCP/plogical/adminPass.py --password $ADMIN_PASS
+/usr/local/CyberPanel/bin/python2 /usr/local/CyberCP/plogical/adminPass.py --password "$ADMIN_PASS"
 systemctl restart lscpd
 systemctl restart lsws
 echo "/usr/local/CyberPanel/bin/python2 /usr/local/CyberCP/plogical/adminPass.py --password \"\$@\"" > /usr/bin/adminPass
diff --git a/upgrade_modules/10_post_tweak.sh b/upgrade_modules/10_post_tweak.sh
index 85cf57c29..370ff79e7 100644
--- a/upgrade_modules/10_post_tweak.sh
+++ b/upgrade_modules/10_post_tweak.sh
@@ -72,6 +72,13 @@ if [[ "$Server_Country" = "CN" ]] ; then
 fi
 
 sed -i 's|python2|python|g' /usr/bin/adminPass
+if [[ -f /usr/bin/adminPass ]]; then
+  cat >/usr/bin/adminPass <<'EOF'
+/usr/local/CyberPanel/bin/python /usr/local/CyberCP/plogical/adminPass.py --password "$@"
+systemctl restart lscpd
+echo "$@" > /etc/cyberpanel/adminPass
+EOF
+fi
 chmod 700 /usr/bin/adminPass
 
 rm -f /usr/bin/php