diff --git a/scripts/wsrep_sst_xtrabackup-v2.sh b/scripts/wsrep_sst_xtrabackup-v2.sh
index e3ad8257df6..2634fead919 100644
--- a/scripts/wsrep_sst_xtrabackup-v2.sh
+++ b/scripts/wsrep_sst_xtrabackup-v2.sh
@@ -689,9 +689,8 @@ then
            INNOEXTRA+=" --user=$WSREP_SST_OPT_USER"
         fi
 
-        if [ -n "$WSREP_SST_OPT_PSWD" ]; then
-#           INNOEXTRA+=" --password=$WSREP_SST_OPT_PSWD"
-           export MYSQL_PWD="$WSREP_SST_OPT_PSWD"
+        if [ -n "${WSREP_SST_OPT_PSWD:-}" ]; then
+           INNOEXTRA+=" --password=$WSREP_SST_OPT_PSWD"
         else
            # Empty password, used for testing, debugging etc.
            INNOEXTRA+=" --password="
diff --git a/scripts/wsrep_sst_xtrabackup.sh b/scripts/wsrep_sst_xtrabackup.sh
index 7279c623288..4acf2854301 100644
--- a/scripts/wsrep_sst_xtrabackup.sh
+++ b/scripts/wsrep_sst_xtrabackup.sh
@@ -442,9 +442,8 @@ then
            INNOEXTRA+=" --user=$WSREP_SST_OPT_USER"
         fi
 
-        if [ -n "$WSREP_SST_OPT_PSWD"  ]; then
-#           INNOEXTRA+=" --password=$WSREP_SST_OPT_PSWD"
-           export MYSQL_PWD="$WSREP_SST_OPT_PSWD"
+        if [ -n "${WSREP_SST_OPT_PSWD:-}" ]; then
+           INNOEXTRA+=" --password=$WSREP_SST_OPT_PSWD"
         else
            # Empty password, used for testing, debugging etc.
            INNOEXTRA+=" --password="