Enhance edit account block