Fix spontaneous logout on upgrade