some changes in account logic