Fix problems with NTLM authentication introduced earlier