diff --git a/kcmkwin/kwinoptions/main.cpp b/kcmkwin/kwinoptions/main.cpp
index 5178de30d9..30881398eb 100644
--- a/kcmkwin/kwinoptions/main.cpp
+++ b/kcmkwin/kwinoptions/main.cpp
@@ -118,6 +118,7 @@ void KWinOptions::load()
   mActions->load();
   mMoving->load();
   mAdvanced->load();
+  setChanged( false );
 }
 
 
@@ -128,6 +129,7 @@ void KWinOptions::save()
   mMoving->save();
   mAdvanced->save();
 
+  setChanged( false );
   // Send signal to kwin
   mConfig->sync();
   if ( !kapp->dcopClient()->isAttached() )
diff --git a/kcmkwin/kwinoptions/windows.cpp b/kcmkwin/kwinoptions/windows.cpp
index 85bb14cf03..efeae09727 100644
--- a/kcmkwin/kwinoptions/windows.cpp
+++ b/kcmkwin/kwinoptions/windows.cpp
@@ -360,6 +360,7 @@ void KFocusConfig::load( void )
     setTraverseAll( config->readBoolEntry(KWIN_TRAVERSE_ALL, false ));
 
     config->setGroup("Desktops");
+    setChanged(false);
 }
 
 void KFocusConfig::save( void )
@@ -414,6 +415,7 @@ void KFocusConfig::save( void )
             kapp->dcopClient()->attach();
         kapp->dcopClient()->send("kwin*", "", "reconfigure()", "");
     }
+    setChanged(false);
 }
 
 void KFocusConfig::defaults()
@@ -425,6 +427,7 @@ void KFocusConfig::defaults()
     setTraverseAll( false );
     setRollOverDesktops(true);
     setShowPopupinfo(false);
+    setChanged(true);
 }
 
 KAdvancedConfig::~KAdvancedConfig ()
@@ -545,6 +548,7 @@ void KAdvancedConfig::load( void )
 
     setElectricBorders(config->readNumEntry(KWM_ELECTRIC_BORDER, false));
     setElectricBorderDelay(config->readNumEntry(KWM_ELECTRIC_BORDER_DELAY, 150));
+    setChanged(false);
 }
 
 void KAdvancedConfig::save( void )
@@ -572,6 +576,7 @@ void KAdvancedConfig::save( void )
             kapp->dcopClient()->attach();
         kapp->dcopClient()->send("kwin*", "", "reconfigure()", "");
     }
+    setChanged(false);
 }
 
 void KAdvancedConfig::defaults()
@@ -581,6 +586,7 @@ void KAdvancedConfig::defaults()
     setShadeHoverInterval(250);
     setElectricBorders(0);
     setElectricBorderDelay(150);
+    setChanged(true);
 }
 
 void KAdvancedConfig::setEBorders()
@@ -940,6 +946,7 @@ void KMovingConfig::load( void )
     else setWindowSnapZone(v);
 
     OverlapSnap->setChecked(config->readBoolEntry("SnapOnlyWhenOverlapping",false));
+    setChanged(false);
 }
 
 void KMovingConfig::save( void )
@@ -999,6 +1006,7 @@ void KMovingConfig::save( void )
             kapp->dcopClient()->attach();
         kapp->dcopClient()->send("kwin*", "", "reconfigure()", "");
     }
+    setChanged(false);
 }
 
 void KMovingConfig::defaults()
@@ -1016,6 +1024,7 @@ void KMovingConfig::defaults()
 
     setMinimizeAnim( true );
     setMinimizeAnimSpeed( 5 );
+    setChanged(true);
 }
 
 int KMovingConfig::getBorderSnapZone() {