Refactored users edit