Partial rewrite of auth.