Improve login message / experience when account isn't activated

If a new user misses the account activation, it can be difficult to know why logging in is failing (e.g. if the email never arrives - for whatever reason - e.g. cheap email forwarding service).

When I tried to log in, after creating the account a while ago, I got the error: "The username or password was incorrect."

I then went to reset password, which I was able to do, but still got the same error.

I then created a new account, and still go the same error. But then I noticed the email about activating my account, which I did and then I was able to log in.

Suggestions:
1. Give a different message when the account is not yet activated, preferably with a link to send a new activation email.
2. (and / or) make the password reset activate the account (since it only works if email works).

Since the password reset email gives email addresses that can be contacted, this isn't a show-stopper.

Start by locating the login and password-reset entry points and tracing how unactivated accounts are handled. Decide whether the issue should provide a distinct activation message with a resend link, activate accounts through password reset, or support both. Done means the chosen flow clearly explains the problem and lets the user recover access.

Written by the indexing model from the issue text.