Merge pull request #150 from hvierendeels/1.4

check on account.category,cherry-picked from master