users edit improvements