Fighting account.selected bug