Some fixes in organization user delete