Cheers for the replies gents.
I did put ACP50 in the lock ages ago but thought that made the lock a bit sticky that's why I washed it out with WD40.
It seems to be working ok now.
Yet Another issue with the XT....
And with no dealer within 100 miles of me I think my next bike WONT be a Yamaha!