fixes #6578 - Fixes auto-attach subscriptions button, BZ 1019227
Merge pull request #4397 from cfouant/fixes-6012-new

fixes #6578 - Fixes auto-attach subscriptions button in UI, BZ 1019227