Still more tweaks to the auth system