Unfortunate, it sounds like a mess and a half. Does any one know. If I found myself in the same situation would creating different windows accounts, one for each teams/azureAD account help keep them separate?