Somebody had to do it before it was fixed, lol.
More on topic though, I would think that a two officer limit is the best solution. Just in general I find myself coming face-to-face with an enemy officer at least as often as enlisted soldiers, sometimes maybe even more often. Kind of ruins your mood when it happens repeatedly.