IoC and account manager fix