Take the changed username when connecting through SSO.

The entry/connect page has several use-cases where a user is presented with a username option. Before their choice was never honoured. This change fixes that.

I'm hoping that this pull request can get merged into stage and tested against a few known SSO configurations for customers. I've already tested that this isn't a way of hijacking a username as the code requires a password if you choose an existing username.