Merge pull request #291 from PrismorSec/fix/scope-ux