Signal lights

[fairweatherrider]

I'm having a little trouble with my signal lights. Before I ride I check the lights and I have to continuously push the switch that shuts them off before they finally will work. I tried spraying contact cleaner in the assembly, when the key is off of course, but that didn't work.
I'm also wondering, is there a replacement signal light relay or assembly that will automatically turn the lights OFF after a turn is made. I forget many times to push in the switch to shut them off and I think that's a littttttle dangerous.