you don't say whether its the leading or trailing unit's cab that stays lit. at times I enter both engine numbers into the handheld, so that if the trailing unit's headlight comes back on (say from a power interruption), I can turn it off with that engine's address.
you may try that to see if it shuts the light off. if it's the trailing unit.