fixes #6964 - replace default scope that hides users with explicit scope
(cherry picked from commit cad9cce912a371018a489a874d896af241f91bd0)
fixes #6964 - replace default scope that hides users with explicit scope
(cherry picked from commit cad9cce912a371018a489a874d896af241f91bd0)