adding better account management code