RF-13569: fix user editing