Fixed #5764 (Store Token flags in a single variable)