Password shortcode not displaying password in Account Upgrade Notification email

We are experiencing an issue with the {password} not displaying the user’s password in the Account Upgrade Notification email.

We have a Registration Complete email setup, and this email works great and shows the password just fine in email. The template for this working email is:

Dear {first_name} {last_name}

Your registration is now pending!

Registration details:
Username: {user_name}
Password: {password}

Once the team has reviewed and approved your application, you may login to the member area at the following URL:
{login_link}

Thank You.

However, using a similar template for the Account Upgrade Notification email, instead of the password, the words “Password: Your current password” are displayed instead. Here is the template for this notification, where the password does not display as needed:

Dear {first_name} {last_name}

Congratulations, your account is now active!

Registration details:
Username: {user_name}
Password: {password}

You may login here:
{login_link}

Thank You.

Any thoughts or ideas for how we might get the password to display in the Account Upgrade Notification email are most welcome. Thank you for this wonderful plugin. ??