Ben, I am not sure if mine had the headlight-mounted safety switch or not. I had assumed it did long ago but was converted to the fan case mounted switch later on. The lock mechanism in the headlight cap, and the cap itself, had suffered from some damage from being forced, so my guess it was from frustration of the finicky switch.
