Account Expiry form controls displayed multiple times on "My account" page

Issue Summary

The Account Expiry form controls are being outputted multiple times under the "My account" section, if multiple tabs are available in edit mode.

I am using the Profile module to collect some basic "Company information", and therefore I have an additional "Company information" tab available in edit mode. When editing an user account from the "My account" page, the "Account expiry date" form appears not only under the default "Account settings" tab, but also at the top of the "Company information" tab. Both forms function properly.

Drupal config: Drupal 5.3, CCK 5.x-1.6-1, Date 5.x-1.8, Account Types 5.x-1.4, Organic Groups 5.x-4.1, Account Expiry 5.x-1.x-dev (2008-Jan-28), Pathauto 5.x-2.0, Site User List 5.x-1.x-dev, Token 5.x-1.9, Update status 5.x-2.0, Views 5.x-1.6.