Repair some account bug
Merge branch 'tarot'