Fitts's law in full effect: I repeatedly logged myself out when wanting to collapse the shortcut bar

I'd like the logout link and the button to show/hide the shortcuts to be a bit further apart. It keeps happening that I log myself out instead of collapse the toolbar. And I know I'm not the only one :-)

Bojhan:
dammit! I clicked log out
the new toolbar, needs whitespace

I think option 2 is more fool proof and has the benefit of not adding extra whitespace. Not sure if this position before the user name has implication for what people expect the toggle to do. Or if that's a problem at all.