[fix bug 979203] Clean up external account data
Merge branch 'jpotts-fix_979203'