Get template overrides working and update accounts-t9n