diff --git a/data/sugar.schemas.in b/data/sugar.schemas.in
index b39ff77..dc7104d 100644
--- a/data/sugar.schemas.in
+++ b/data/sugar.schemas.in
@@ -168,5 +168,18 @@
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/desktop/sugar/show_logout</key>
+      <applyto>/desktop/sugar/show_logout</applyto>
+      <owner>sugar</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+      <!-- FIXME: Enable these after string freeze is over
+        <short>Show Log out</short>
+        <long>If TRUE, Sugar will show a "Log out" option.</long>-->
+      </locale>
+    </schema>
+
   </schemalist>
 </gconfschemafile>
diff --git a/src/jarabe/view/buddymenu.py b/src/jarabe/view/buddymenu.py
index 99cf57f..35a8301 100644
--- a/src/jarabe/view/buddymenu.py
+++ b/src/jarabe/view/buddymenu.py
@@ -18,6 +18,7 @@ import logging
 from gettext import gettext as _
 
 import gtk
+import gconf
 
 from sugar.graphics.palette import Palette
 from sugar.graphics.menuitem import MenuItem
@@ -83,10 +84,13 @@ class BuddyMenu(Palette):
         self.menu.append(item)
         item.show()
 
-        item = MenuItem(_('Logout'), 'system-logout')
-        item.connect('activate', self.__logout_activate_cb)
-        self.menu.append(item)
-        item.show()
+        client = gconf.client_get_default()
+        
+        if client.get_bool('/desktop/sugar/show_logout'):
+            item = MenuItem(_('Logout'), 'system-logout')
+            item.connect('activate', self.__logout_activate_cb)
+            self.menu.append(item)
+            item.show()
 
         item = MenuItem(_('Restart'), 'system-restart')
         item.connect('activate', self.__reboot_activate_cb)