Agent checkbox on templates

[bingen]

When creating a new organization with some templates, like Company, the checkbox to add an Agent (instead of a Vault) appears in the initial description, instead of the some of the configuration screens, that would be more natural in my opinion.
Besides, if you miss it (which has happened to me more than once), if you go back you miss all the parameters already filled in (it seems precisely because you have to go back to the initial description and somehow leave the configuration).