Added support for plaintext passwords