maybe solve an occasional bug when deleting accounts and return to list
adapt to new second export format