Fix system messages breaking when user logs out GitOrigin-RevId: 10cce5466fed407469964db7caa4628e9c0536a3