Fix account model