Enhance product set directive, Fix edit account block