Quick fix for account model