Also, I think that the Username and this new field, 'Current Password', should be moved to the first Tab - maybe directly under the 'Name' field - and rename the 'Name' field to 'Account Name', for clarification purposes. I think this will make PWM less confusing for new users - and will tie in nicely with the 'Password Management' FR I'm working on.