Fixed code for account management