Upgrade to match 6.2 authentication plugin system