Fix from @dmitrydvorkin for basic_auth