Handle reauth better. Closes #4