Fix user renames and deletions

related to #1941
fixes #2167