diff --git a/client/domain/kdm/kdmrc b/client/domain/kdm/kdmrc
index c43b085..0e89e17 100644
--- a/client/domain/kdm/kdmrc
+++ b/client/domain/kdm/kdmrc
@@ -8,5 +8,6 @@ MinShowUID=#-env(unix.sr_unix_min_id)-#
 #?env(unix.sr_unix_min_id)==#
 MinShowUID=1000
 #env#
+[X-:0-Core]
 AutoLoginEnable=false
 AutoLoginUser=
diff --git a/install/1merge/pambase/.calculate_directory b/install/1live/pambase/.calculate_directory
similarity index 100%
rename from install/1merge/pambase/.calculate_directory
rename to install/1live/pambase/.calculate_directory
diff --git a/install/1merge/pambase/su b/install/1live/pambase/su
similarity index 96%
rename from install/1merge/pambase/su
rename to install/1live/pambase/su
index 2fcc0cd..8b1c9e7 100644
--- a/install/1merge/pambase/su
+++ b/install/1live/pambase/su
@@ -30,4 +30,6 @@ session    include      system-auth
 session    required     pam_env.so
 session    optional     pam_xauth.so
 # need for xautologin
+#?pkg(sys-auth/consolekit)!=#
 session    optional     pam_ck_connector.so nox11
+#pkg#
diff --git a/install/1merge/pambase/system-auth b/install/1live/pambase/system-auth
similarity index 100%
rename from install/1merge/pambase/system-auth
rename to install/1live/pambase/system-auth
diff --git a/install/1merge/pambase/system-login b/install/1live/pambase/system-login
similarity index 87%
rename from install/1merge/pambase/system-login
rename to install/1live/pambase/system-login
index 1f50e14..fae079e 100644
--- a/install/1merge/pambase/system-login
+++ b/install/1live/pambase/system-login
@@ -19,3 +19,6 @@ session		include		system-auth
 session		optional	pam_mail.so
 # need for xsesstion run by startx
 session		optional	pam_ck_connector.so
+#?pkg(sys-auth/consolekit)!=#
+session    optional     pam_ck_connector.so nox11
+#pkg#
diff --git a/install/3pxe/dhcpd/dhcpd.conf b/install/3pxe/dhcpd/dhcpd.conf
index ab95a90..9c92b1f 100644
--- a/install/3pxe/dhcpd/dhcpd.conf
+++ b/install/3pxe/dhcpd/dhcpd.conf
@@ -1,2 +1,2 @@
 # Calculate format=dhcp
-filename "pxelinux.0"
+filename "pxelinux.0";