* added better support for passwords