Issue #8204 by tuj: Fixed activation flow