Make Auth reload-friendly