better password support
better password support