Fix several issues with Basic auth preventing it from functioning proper...

...ly (OMS-540)