Base: Attempt to better handle OSPi 1.9.0 authentication