fix laziness bug for accounts