Draft: User deletion improvements

Open feld requested to merge fix/user-delete into develop
Edited by feld

Merge request reports