diff --git a/ChangeLog b/ChangeLog
index 99a7aef..aec8d97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ version 0.9.4 -- unreleased
 	mysql, pgsql, svn: fixed inversed vsname emptyness check
 	mysql:
 	 . Fixed improper use of $vuserhome (Debian: #351083)
+	 . Fixed erroneous removal of tmpfile when it didn't exit
     lib changes
 	vserver:
 	 . init_vservers: fixed Debian bug #351083 (improper readlink syntax)
diff --git a/handlers/mysql b/handlers/mysql
index f89d8d7..ae54aae 100644
--- a/handlers/mysql
+++ b/handlers/mysql
@@ -277,7 +277,7 @@ fi
 fi
 
 # clean up tmp config file
-if [ "$dbusername" != "" ]
+if [ "$dbusername" != "" -a "$dbpassword" != "" ]
 then
 	## clean up tmp config file
 	debug "rm $mycnf"