One easy way to solve this problem would be to do it like how Github distinguish between personal and organization repositories (with a context switcher dropdow

One easy way to solve this problem would be to do it like how Github distinguish between personal and organization repositories (with a context switcher dropdown). On the backend, this would involve converting all current accounts into "sub-accounts". Joining a team would basically create a brand new sub-account under the same login.