Make Auth even more reload-friendly