RC-240 Fixed User Edit