Different Ignition Switch issue

[RLHornbeck]

I am having ignition switch issues but not sure what pieces need replaced, or possibly just cleaned and lubricated.

All electrical parts of the switch work fine.

What does not work:

1. When you start the car the key does not spring back to the on position fully. You must remember to turn the key back slightly after starting.

2. When removing the key the steering lock does not always engage. To get the steering lock to work must giggle the key in lock after taking it out (re-insert the key about 1/8" and giggle) and sometimes turning the steering wheel back and forth seems to help.

This is in a 2000 S that sat for over 7 years due to immobilizer issues.