rework some editprofile case