Support for password too