Fix NTLM regression, close #462