Fix #1278: 2 subscription checkbox's
Merge remote branch 'janich/patch-1' into 2.0