Universal Sign-On unreliable with Microsoft accounts.

I'm adding my vote. When I log in to a site using my O365 account, 1P recognizes that it's MS and offers to save the account, however the list it provides for options are all MS consumer accounts, and not O365 accounts. This makes the feature rather useless in a work environment. I tried adding the same domain from my personal account to my O365 account (https://login.microsoftonline.com) but that didn't help it get into the list.

I'll go one step farther for a feature request. I have many different accounts, some used for testing. I use different containers within FF to manage sessions so I can have multiple accounts logged in at the same time. Any way for 1P to recognize some sort of container/browser differentiator to not always use the same account to log in? Maybe some sites need a "QA/TEST" flag so it will always ask?