[#84679492] Scope selector calls to component
Merge pull request #723 from Tahi-project/ad-hoc-email-bug

[#84679492] Scope selector calls to component