Bug #498 - Fix forms with the new template