Fix user applet log out/shut down, and some other things
Merge pull request #2326 from mtwebster/user-applet-duh

Fix user applet log out/shut down, and some other things