Use a selected account property for cleaner event handling