Add support for account-notify, extended-join