EnvSource based account link does not work when the new login method is from the same source

Create an account with gmail login method. Try and link another gmail login method. The existing gmail gets linked to the new Org Identity instead of the expected result.

Alternate issue, sometimes SSO is triggered and the second gmail address is never asked for also resulting in two Org Identities with the same login identifier.

Same is true with Twitter as a login method.