More resilient auth