Index: admin_menu.inc
===================================================================
--- admin_menu.inc	(revision 53)
+++ admin_menu.inc	(working copy)
@@ -239,7 +239,7 @@
             'path' => $match[1],
             'weight' => 20,
             'query' => 'destination',
-            'parent_path' => 'logout',
+            'parent_path' => 'user/%',
             'options' => array('html' => TRUE),
           );
         }
@@ -311,14 +311,21 @@
     'options' => array('extra class' => 'admin-menu-action admin-menu-icon admin-menu-users', 'html' => TRUE),
   );
   $links[] = array(
-    'title' => 'Log out @username',
-    'path' => 'logout',
+    'title' => '@username',
+    'path' => 'user/%',
     'weight' => -100,
     'parent_path' => '<root>',
     // Note: @username is dynamically replaced by default, we just invoke
     // replacement by setting the 't' key here.
-    'options' => array('extra class' => 'admin-menu-action admin-menu-logout', 't' => array()),
+    'options' => array('extra class' => 'admin-menu-action', 't' => array()),
   );
+  $links[] = array(
+    'title' => 'Log out',
+    'path' => 'logout',
+    'weight' => -100,
+    'parent_path' => '<root>',
+    'options' => array('extra class' => 'admin-menu-action admin-menu-logout'),
+  );
   foreach ($links as $item) {
     $path = $item['path'];
     $item = admin_menu_link_build($item);