diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp
index 8d3f848b5..cab603242 100644
--- a/kcontrol/tdm/tdm-appear.cpp
+++ b/kcontrol/tdm/tdm-appear.cpp
@@ -477,7 +477,12 @@ void TDMAppearanceWidget::save()
   config->writeEntry("Language", langcombo->current());
 
   if (!sakwarning) {
-    config->setGroup("X-:*-Greeter");
+    if (config->hasGroup("X-:*-Greeter")) {
+      config->setGroup("X-:*-Greeter");
+    }
+    else {
+      config->setGroup("X-*-Greeter");
+    }
     config->writeEntry("UseSAK", sakbox->isChecked());
   }
 
@@ -547,7 +552,12 @@ void TDMAppearanceWidget::load()
 
   // See if the SAK is enabled
   if (!sakwarning) {
-    config->setGroup("X-:*-Greeter");
+    if (config->hasGroup("X-:*-Greeter")) {
+      config->setGroup("X-:*-Greeter");
+    }
+    else {
+      config->setGroup("X-*-Greeter");
+    }
     sakbox->setChecked(config->readBoolEntry("UseSAK", false));
   }
   else {