2022-1Q: [EUP] Automatic "End User Portal" activation - additional options