diff --git a/kcms/ksmserver/CMakeLists.txt b/kcms/ksmserver/CMakeLists.txt
index 48a93b952..70b778f6b 100644
--- a/kcms/ksmserver/CMakeLists.txt
+++ b/kcms/ksmserver/CMakeLists.txt
@@ -1,22 +1,23 @@
 # KI18N Translation Domain for this library
 add_definitions(-DTRANSLATION_DOMAIN=\"kcmsmserver\")
 
 set(kcm_smserver_PART_SRCS kcmsmserver.cpp)
 
 qt5_add_dbus_interface(kcm_smserver_PART_SRCS org.freedesktop.login1.Manager.xml login1_manager)
 
 kconfig_add_kcfg_files(kcm_smserver_PART_SRCS smserversettings.kcfgc GENERATE_MOC)
 ki18n_wrap_ui(kcm_smserver_PART_SRCS smserverconfigdlg.ui )
 
 add_library(kcm_smserver MODULE ${kcm_smserver_PART_SRCS})
 
 
 target_link_libraries(kcm_smserver Qt5::Core Qt5::DBus Qt5::Widgets KF5::I18n KF5::ConfigCore KF5::KCMUtils PW::KWorkspace)
 
 install(TARGETS kcm_smserver  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
 
 
 ########### install files ###############
 
 install( FILES kcmsmserver.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
 
+add_subdirectory(kconf_update)
diff --git a/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.py b/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.py
new file mode 100644
index 000000000..a019986ac
--- /dev/null
+++ b/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python3
+import fileinput
+
+for line in fileinput.input():
+    if line.startswith("loginMode="):
+        print ("# DELETE loginMode")
+        line = line.replace("default", "emptySession")
+        print (line.strip())
diff --git a/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.upd b/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.upd
new file mode 100644
index 000000000..00f1e3bd9
--- /dev/null
+++ b/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.upd
@@ -0,0 +1,6 @@
+Version=5
+
+Id=ksmserver_update_loginMode_value_default_enum
+File=ksmserverrc
+Group=General
+Script=ksmserver_update_loginMode_value.py,python3