Fix #3090663: Re-authentication fails (3rd attempt)