Fix for handling situations where configured to not use authentication