fix bugs for different account