Portals; Forgotten Password; Email may incorrectly include the Client Id when Web User Ids are being used

When the "Sign-in Method" for a Portal was set to "Web User Id", the password reset email was including the Client Id mentioning that it was also required for sign-in, even though it was not.

This has been updated so that either the Web User Id or Client Id is included in the email, whichever is relevant to signing the User in.