update CurrentUserContext to hold TennantId