Minor bug fixes
Fixes to template forms so that they can be used on other actions than 'defaultadmin'