Handle the case where an existing user has email returned by shib

By linking the users