added username / password support