Issue #3291020 by bkosborne: Fix support for external auth 2.0.x, we must not pass NULL to one of its functions.