check on account.category,cherry-picked from master