fixed account settings and communication template

All Tests Pass