added support for password comment field