Refactor edit user form