Accommodate new ensure_auth
Authentication house-keeping