Fix edit account block
Enhance product set directive
Merge pull request #1047 from loiccouturier/master

Enhance product set directive, Fix edit account block