This should have been part of commit e925286f. It is pointless to set the password to empty if it's already empty.
