Fix Wallet account issue