Fixes #3196 - Switch tokens to default to on