[IMP] Improve change accounts from company