Improved handling of basic auth userid & password.