Issue #2 fixed edit_user