account/add-on improvements