Fixed following O365 update#16

Open

Xenov-X wants to merge 2 commits intoRaikia:masterfrom

Commits on Apr 16, 2020

Fixing detection of O365 use and accomodating edge case where randomised username is valid
Xenov-X
committed
Added accomodation for federated login detection
Xenov-X
committed