Fixup account model