Fixes #5040: Fix organization wide auto attach of subscriptions via API ...

...and UI.
Correct!