Improved account management (used in admin tracking)