Fixes #4648 - make sure default password are not exposed
Merge pull request #80 from ares/master

Fixes #4648 - make sure default password are not exposed