also fix account model