fixes to user and user deletion