diff --git a/kgreeter/kgreeter.cpp b/kgreeter/kgreeter.cpp
index 15b4d018..ba1a01e2 100644
--- a/kgreeter/kgreeter.cpp
+++ b/kgreeter/kgreeter.cpp
@@ -292,11 +292,11 @@ int main(int argc, char**argv)
     }
 
     const QString kgreetercolorscheme = kgreetersettings.value("greeter/colorscheme").toString();
-    if (kgreetercolorscheme.isEmpty()) {
-        app.setPalette(KGlobalSettings::createApplicationPalette());
-    } else {
+    if (!kgreetercolorscheme.isEmpty()) {
         KSharedConfigPtr kcolorschemeconfig = KSharedConfig::openConfig(QString::fromLatin1("color-schemes/%1.colors").arg(kgreetercolorscheme), KConfig::FullConfig, "data");
         app.setPalette(KGlobalSettings::createApplicationPalette(kcolorschemeconfig));
+    } else {
+        app.setPalette(KGlobalSettings::createApplicationPalette());
     }
 
     glibloop = g_main_loop_new(NULL, false);
diff --git a/kgreeter/lightdm-kgreeter-greeter b/kgreeter/lightdm-kgreeter-greeter
deleted file mode 100755
index 434e2919..00000000
Binary files a/kgreeter/lightdm-kgreeter-greeter and /dev/null differ