change wording and add account management