fix user edit
Merge branch 'production'