fix broken templates
Merge branch 'issue/3/recipients-accounts'