Fixes #4648 - make sure default password are not exposed