One change that may not be easily doable (if not doable, feel free to remove the blocker) but will improve the experience has to do with the checkbox for unlisted add-ons. What we can do is: * Remove the checkbox “Do not list my add-on on this site” * Remove the “Continue” button on validation * Replace the continue button with two options that will funnel developers to the right sets of options: * “Host Add-on on my own server” * “Host Add-on with Mozilla” If this is too much to change, then a fairly easy compromise would be to replace the checkbox with two radio buttons that say “Where will your add-on be hosted? [My own server] [With Mozilla]” The option to choose a bundled add-on will appear on subsequent pages, instead of after clicking the checkbox. (This change may not be easy to make, because we will need to create a few new pages).