"Add or Remove..." behaviour for PM creators

Could be this again (or still):