Additional Fixes to Delete User Problem