diff --git a/kcontrol/smserver/kcmsmserver.cpp b/kcontrol/smserver/kcmsmserver.cpp
index 3aca33508..b81e41c77 100644
--- a/kcontrol/smserver/kcmsmserver.cpp
+++ b/kcontrol/smserver/kcmsmserver.cpp
@@ -94,6 +94,7 @@ void SMServerConfig::load(bool useDefaults )
 
   c->setGroup("Logout");
   dialog->showLogoutStatusDialog->setChecked(c->readBoolEntry("showLogoutStatusDlg", true));
+  dialog->showFancyFadeAway->setChecked(c->readBoolEntry("doFancyLogout", true));
 
   delete c;
 
@@ -123,6 +124,7 @@ void SMServerConfig::save()
   c->writeEntry("excludeApps", dialog->excludeLineedit->text());
   c->setGroup("Logout");
   c->writeEntry( "showLogoutStatusDlg", dialog->showLogoutStatusDialog->isChecked());
+  c->writeEntry( "doFancyLogout", dialog->showFancyFadeAway->isChecked());
   c->sync();
   delete c;
 
diff --git a/kcontrol/smserver/smserverconfigdlg.ui b/kcontrol/smserver/smserverconfigdlg.ui
index 2381a20c2..d222fefa8 100644
--- a/kcontrol/smserver/smserverconfigdlg.ui
+++ b/kcontrol/smserver/smserverconfigdlg.ui
@@ -54,6 +54,20 @@
                         <string>Check this option if you want the session manager to display a logout confirmation dialog box.</string>
                     </property>
                 </widget>
+                <widget class="TQCheckBox">
+                    <property name="name">
+                        <cstring>showFancyFadeAway</cstring>
+                    </property>
+                    <property name="enabled">
+                        <bool>false</bool>
+                    </property>
+                    <property name="text">
+                        <string>Show fancy &amp;logout fadeaway</string>
+                    </property>
+                    <property name="whatsThis" stdset="0">
+                        <string>Check this option if you want to see a fancy fadeaway when displaying a logout confirmation dialog box.</string>
+                    </property>
+                </widget>
                 <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>offerShutdownCheck</cstring>
@@ -220,6 +234,18 @@
         <receiver>SMServerConfigDlg</receiver>
         <slot>configChanged()</slot>
     </connection>
+    <connection>
+        <sender>confirmLogoutCheck</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>showFancyFadeAway</receiver>
+        <slot>setEnabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>showFancyFadeAway</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>SMServerConfigDlg</receiver>
+        <slot>configChanged()</slot>
+    </connection>
     <connection>
         <sender>showLogoutStatusDialog</sender>
         <signal>toggled(bool)</signal>