issue #19286: removed logging
issue #19287: plug in real orgs from user
issue #19287: we verify and persist user's scope choice