Add support for servers with passwords