Account Management: minor cleanup