some impr. in user edit