updated templates
rm account handling via the wiki