54 plate Clio Headlight Problems

My girlfriends 54 plate Clio 1.2 has developed a strange problem. Earlier in the week, the original battery failed. This was replaced with a brand new one. Ever since, the headlights work ok, but when you turn them off on the switch, they stay on! They go off when the ignition is turned off, and the sidelights still work independently of the headlights.



I'm assuming that the headlight stalk itself is at fault, and the battery issue is just a coincidence. Before i buy a replacement switch, is there anything else likely to be wrong?



Also, is the headlight stalk easy to change? Is it a steering wheel off job or not?



All help much appreciated!!