Fix account model / view