better handling of user/admin accessory adding