fixing account storage