diff --git a/automysqlbackup.sh b/automysqlbackup.sh
index 7be5ed3..bf3f9fb 100755
--- a/automysqlbackup.sh
+++ b/automysqlbackup.sh
@@ -320,7 +320,7 @@ if [ "${MAX_ALLOWED_PACKET}" ];
 
 # Database dump function
 dbdump () {
-${MYSQLDUMP} --user=${USERNAME} --password=${PASSWORD} --host=${DBHOST} ${OPT} ${1} > ${2}
+${MYSQLDUMP} --user=${USERNAME} --host=${DBHOST} ${OPT} ${1} > ${2}
 return $?
 }
 
@@ -380,6 +380,10 @@ else
 	HOST=${DBHOST}
 fi
 
+if [ ! -z "${PASSWORD}" ]; then
+	OPT="${OPT} --password=${PASSWORD}"
+fi
+
 # If backing up all DBs on the server
 if [ "${DBNAMES}" = "all" ]; then
         DBNAMES="`${MYSQL} --user=${USERNAME} --password=${PASSWORD} --host=${DBHOST} --batch --skip-column-names -e "show databases"| ${SED} 's/ /%/g'`"