Fix user is shown as deleted incorrectly
fix merge