fix create/retrieve account