fix few bugs on user edition