Tweaks in edit user