Finish partial hack of auth.