Some new logic required for "Forgotten PW"

My users can login by utilizing their e-mail as "UserName".

However, when they forget their password and want to update it, they cannot get it by giving the e-mailaddress as their username.
The first have to "Forgot Username", then using their real user name and their e-mail address, they can do "Forgotten PW".

Since the real only security here lies in their e-mailadress (which is already known by the system).
And the "extra" security from asking for the username is easily bypassed.
Wouldn't it make sense to adapt the forgotten PW logic according to those facts?

Change the Login Method in CBs configuration to email only and forgot login won't bother asking for username. If you still allow login via username then it's valid for the user needing to know their username.

Yes, our forgot login has pointless logic at this time as it was designed a decade ago. It will be gone in CB 3.x as you'll just use Joomlas.