Fix up user deletion