Fix #3090663: Re-authentication fails (2nd attempt)