Improved behavior for managing accounts.