Issue Summary

The Password Expiration Reminder mail template is defined as the following:

Hello $username,

your password will expire in $daysToPasswordExpiration day(s). Please use the following link to change your password to avoid losing access to Crowd and connected applications.

$changePasswordlink

$deploymenttitle administrator

The above has the $username macro. This macro, is supposed to refer to the user's account username like how it is in other mail templates. In its current implementation, the $username macro refer to the firstname lastname value.

Expected Results

The $username macro should refer to the user's username. Also, it would be better that the template also have a separate macro for $firstname and $lastname.

Actual Results

The $username macro refers to the "firstname lastname" value.

Workaround

There is currently no known workaround.