After upgrading to Intrepid, a dialogue asked me to upgrade my logout menu so it would also handle instant messages and quick user switching. However in doing so, it made my Shutdown and Restart buttons disappear (Now they're under "System." How can I get them back in the logout menu?

Additional info: The buttons are where they belong in some other accounts on this computer.

Also: A launchpad answer suggested checking that System>Administration>Login Window>Local preference for "active menu" was checked, and yes it is checked.

Thank you for your help!