Fix delaying announce until identified (Pt. Two)