--- /usr/lib/python2.7/site-packages/oblogout/__init__.py	2012-03-05 14:51:08.000000000 +0100
+++ __init__.py	2012-03-05 20:43:49.185068877 +0100
@@ -176,6 +176,7 @@
         self.parser.read(config)
         
         # Set some safe defaults
+	self.lock_before_suspend = False
         self.opacity = 50
         self.button_theme = "default"
         self.bgcolor = gtk.gdk.color_parse("black")
@@ -188,6 +189,9 @@
                 self.usehal = self.parser.getboolean("settings","usehal")
             else:
                 self.usehal = True
+
+	    if self.parser.has_option("settings","lock_before_suspend"):
+		self.lock_before_suspend = self.parser.getboolean("settings","lock_before_suspend")
             
         if self.usehal:    
             from dbushandler import DbusController
@@ -363,7 +367,10 @@
                 
         elif (data == 'suspend'):
             self.window.hide()
-            self.__exec_cmd(self.cmd_lock)
+
+	    if(self.lock_before_suspend):
+	        self.__exec_cmd(self.cmd_lock)
+
             if self.usehal:
                 self.dbus.suspend()
             
@@ -372,7 +379,10 @@
                 
         elif (data == 'hibernate'):
             self.window.hide()
-            self.__exec_cmd(self.cmd_lock)
+
+	    if(self.lock_before_suspend):
+	        self.__exec_cmd(self.cmd_lock)
+
             if self.usehal:
                 self.dbus.hibernate()
             else: