Merge "Fix logic in dump_accounts"