fix account related issues