YH-269: Option to allow user edit