Move account name to template