Expiry date sets before first account activation.

Hello,
This is a great module and this functionality is badly required. But currently it is unusable in some cases.
In our site, visitors can create accounts but administrator approval is required. In such cases when users create an account, by default Drupal keeps the account status to be "blocked" until approved (i.e. unblocked) by a site admin. When an user creates an account (but is pending approval from site admin) the expiry date is set immediately! This should not happen because to the user the account is still "pending approval" and he/she cannot use it. The account expiry date should be set when the admin approves/unblocks the account.
Furthermore, when the site admin is approving/unblocking the account of a new user, then account expiry date (which was created when the user just registered but was pending approval) is rolled back by 10 years! and ends up automatically blocking the account (because it ends up being a past expiry date).

Other similar modules I'm using are: Account Types 5.x-1.4, Extended user status notifications 5.x-1.2

- n00bie