Fix all templates with account-base