Forgot Password for Secondary Web Logins

Hello technical brains trust! I am hoping for some advice on the Forgot Password functionality.

We are working on opening up specific web content for a subset of our customers, namely our corporate partners. 

We want to keep information that will drive what is made available online against the Corporate Partners' Organisation constituent record and assign individual contacts at the organisation with a login against this record.

We want to allow individuals to also have a Personal login linked to their personal constituent record that uses the same email address.

Our initial approach has been to create a new login type that is control grouped so that it can only be added and managed by the Corporate Partner team. Customers are then able to have a Personal and Corporate Account login using the same email address. The password can be different if they wish.

We have run into issues related to the Forgot Password button within the client. This button sends an email that resets the web login type ID #1 which will be the one associated with the individual.

While we are able to edit the link in the forgot password issued from the website and this works as expected.

Has anyone come across a similar issue? Is there a different way that we should consider to achieve what we are trying to do?

Any thoughts / advice is greatly appreciated!

Thanks in advance,

Mardi.

Arts Centre Melbourne.