Can't get it into neutral

[Joey3493]

Hey guys, recently bought my 94 xj600. Occasionally the neutral light does not come on even if the bike is in neutral. I'll have to really mess around with it to get the light to come on/stay on so that I can turn the bike on. Is this my neutral safety switch? That's what my findings are leading me to believe but I wanted to ask for myself. Thanks for the help!