diff --git a/profiles/templates/3.6/2_ac_install_merge/Depends/consolekit b/profiles/templates/3.6/2_ac_install_merge/Depends/consolekit
index b7db0f3d1..111f4a551 100644
--- a/profiles/templates/3.6/2_ac_install_merge/Depends/consolekit
+++ b/profiles/templates/3.6/2_ac_install_merge/Depends/consolekit
@@ -1 +1 @@
-# Calculate append=skip merge(sys-auth/consolekit)!= merge=sys-auth/pambase,x11-misc/sddm
+# Calculate append=skip merge(sys-auth/consolekit)!= merge=sys-auth/pambase,x11-misc/sddm,sys-auth/elogind
diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-auth/pambase/system-auth b/profiles/templates/3.6/2_ac_install_merge/sys-auth/pambase/system-auth
index 4236b55c8..fd47647fb 100644
--- a/profiles/templates/3.6/2_ac_install_merge/sys-auth/pambase/system-auth
+++ b/profiles/templates/3.6/2_ac_install_merge/sys-auth/pambase/system-auth
@@ -9,7 +9,7 @@ password   sufficient   pam_unix.so nullok sha256 shadow use_authtok
 password   required     pam_deny.so
 
 session    required     pam_limits.so
-#?pkg(sys-auth/elogind)!=&&pkg(gnome-extra/cinnamon-session)!=||pkg(sys-auth/elogind)!=&&pkg(gnome-base/gnome-session)!=#
+#?pkg(sys-auth/elogind)!=&&pkg(sys-auth/consolekit)==#
 -session   optional     pam_loginuid.so
 -session   optional     pam_elogind.so
 #pkg#
diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/pambase/system-auth b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/pambase/system-auth
index 946f80f66..84f07244f 100644
--- a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/pambase/system-auth
+++ b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/pambase/system-auth
@@ -44,7 +44,7 @@ password   required     pam_deny.so
 
 session    required     pam_env.so
 session    required     pam_limits.so
-#?pkg(sys-auth/elogind)!=&&pkg(gnome-extra/cinnamon-session)!=||pkg(sys-auth/elogind)!=&&pkg(gnome-base/gnome-session)!=#
+#?pkg(sys-auth/elogind)!=&&pkg(sys-auth/consolekit)==#
 -session   optional     pam_loginuid.so
 -session   optional     pam_elogind.so
 #pkg#
diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/conf.d/xdm b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/conf.d/xdm
index b744ed656..ab81c23a9 100644
--- a/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/conf.d/xdm
+++ b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-base/xorg-server/conf.d/xdm
@@ -32,6 +32,10 @@ START_STOP_ARGS=
 #?pkg(x11-misc/lightdm)!=#
 DISPLAYMANAGER="lightdm"
 START_STOP_ARGS=
+#pkg#
+#?pkg(x11-misc/lightdm)==&&pkg(x11-misc/sddm)!=#
+DISPLAYMANAGER="sddm"
+START_STOP_ARGS=
 #!pkg#
 XUSER=#-cl_autologin-#
 DISPLAYMANAGER="bash"
diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/sddm/sddm.conf b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/sddm/sddm.conf
index c101d2a44..624e0ed7c 100644
--- a/profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/sddm/sddm.conf
+++ b/profiles/templates/3.6/3_ac_install_live/1-merge/x11-misc/sddm/sddm.conf
@@ -19,3 +19,11 @@ CursorTheme=Calculate
 [Users]
 MaximumUid=65000
 MinimumUid=1000
+
+#?cl_autologin!=#
+[Autologin]
+User=#-cl_autologin-#
+#!cl_autologin#
+[Autologin]
+!User=
+#cl_autologin#
diff --git a/profiles/templates/3.6/3_ac_install_live/Depends/consolekit b/profiles/templates/3.6/3_ac_install_live/Depends/consolekit
new file mode 100644
index 000000000..111f4a551
--- /dev/null
+++ b/profiles/templates/3.6/3_ac_install_live/Depends/consolekit
@@ -0,0 +1 @@
+# Calculate append=skip merge(sys-auth/consolekit)!= merge=sys-auth/pambase,x11-misc/sddm,sys-auth/elogind
diff --git a/profiles/templates/3.6/6_ac_install_configure/session b/profiles/templates/3.6/6_ac_install_configure/session
index 8d2ce6a12..da6fccf48 100644
--- a/profiles/templates/3.6/6_ac_install_configure/session
+++ b/profiles/templates/3.6/6_ac_install_configure/session
@@ -1,4 +1,4 @@
-# Calculate format=samba merge=x11-base/xorg-server,x11-misc/lightdm cl_setup==session||cl_setup== path=/var/lib/calculate name=calculate.env
+# Calculate format=samba merge=x11-misc/sddm,x11-base/xorg-server,x11-misc/lightdm cl_setup==session||cl_setup== path=/var/lib/calculate name=calculate.env
 
 [main]
 cl_home_crypt_set = #-cl_install_home_crypt_set-#
diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2020/20200803 b/profiles/templates/3.6/6_ac_update_sync/remerge/2020/20200803
new file mode 100644
index 000000000..a9450591f
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_update_sync/remerge/2020/20200803
@@ -0,0 +1,4 @@
+# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-auth/elogind,sys-auth/pambase,x11-misc/sddm,x11-base/xorg-server
+
+[overlay-calculate]
+remerge = #-cl_pass_file-#