Merge "Ensure updateActiveUser is called before generateChallenge" into sc-dev