Add short block for user account. Fix cache.
Merge pull request #666 from loiccouturier/master

Add short block for user account. Fix cache.