--- kdebase-3.5.4/kicker/kicker/ui/k_mnu.cpp.tn	2006-11-11 01:34:49.000000000 +0100
+++ kdebase-3.5.4/kicker/kicker/ui/k_mnu.cpp	2006-11-11 01:35:52.000000000 +0100
@@ -283,7 +283,7 @@
         insertSeparator();
     }
 
-    if (DM().isSwitchable() && kapp->authorize("switch_user"))
+    if (DM().isSwitchable() && getenv("DM_CONTROL") && kapp->authorize("switch_user"))
     {
         sessionsMenu = new QPopupMenu( this );
         insertItem(KickerLib::menuIconSet("switchuser"), i18n("Switch User"), sessionsMenu);
--- kdebase-3.5.4/kdesktop/krootwm.cc.tn	2006-11-11 19:37:30.000000000 +0100
+++ kdebase-3.5.4/kdesktop/krootwm.cc	2006-11-11 19:41:20.000000000 +0100
@@ -459,7 +459,7 @@
     }
     int lastSep = desktopMenu->insertSeparator();
 
-    if (sessionsMenu && kapp->authorize("switch_user"))
+    if (sessionsMenu && getenv("DM_CONTROL") && kapp->authorize("switch_user"))
     {
         desktopMenu->insertItem(SmallIconSet("switchuser" ), i18n("Switch User"), sessionsMenu);
         needSeparator = true;