Added support for server passwords