Hi Michael,

I'm not sure if I'm interpreting it correctly, but it looks like the code tries first to authenticate using the full email address, and if that fails it does the lookup based on email address to resolve the name? So, for installations that don't have the email/username difference, the effective code is completely unchanged?

The file you posted has been reformatted with a different code style, which makes it difficult to determine exactly what the changes are. Would it be possible to get a minimal diff/patch?

Thanks,
Josh