diff --git a/profiles/templates/3.5/2_ac_install_merge/Depends/elogind b/profiles/templates/3.5/2_ac_install_merge/Depends/elogind
index 4e8f40f8c..dd46af7ff 100644
--- a/profiles/templates/3.5/2_ac_install_merge/Depends/elogind
+++ b/profiles/templates/3.5/2_ac_install_merge/Depends/elogind
@@ -1 +1 @@
-# Calculate append=skip merge(sys-auth/elogind)!= merge=x11-misc/sddm
+# Calculate append=skip merge(sys-auth/elogind)!= merge=x11-misc/sddm,sys-auth/pambase
diff --git a/profiles/templates/3.5/2_ac_install_merge/sys-auth/pambase/system-auth b/profiles/templates/3.5/2_ac_install_merge/sys-auth/pambase/system-auth
index ddcb30dbe..06338d19c 100644
--- a/profiles/templates/3.5/2_ac_install_merge/sys-auth/pambase/system-auth
+++ b/profiles/templates/3.5/2_ac_install_merge/sys-auth/pambase/system-auth
@@ -9,4 +9,8 @@ password   sufficient   pam_unix.so nullok sha256 shadow use_authtok
 password   required     pam_deny.so
 
 session    required     pam_limits.so
+#?pkg(sys-auth/elogind)!=#
+-session   optional     pam_loginuid.so
+-session   optional     pam_elogind.so
+#pkg#
 session    required     pam_unix.so
diff --git a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-auth/pambase/system-auth b/profiles/templates/3.5/3_ac_install_live/1-merge/sys-auth/pambase/system-auth
index d8e74016a..10563f8e3 100644
--- a/profiles/templates/3.5/3_ac_install_live/1-merge/sys-auth/pambase/system-auth
+++ b/profiles/templates/3.5/3_ac_install_live/1-merge/sys-auth/pambase/system-auth
@@ -44,6 +44,10 @@ password   required     pam_deny.so
 
 session    required     pam_env.so
 session    required     pam_limits.so
+#?pkg(sys-auth/elogind)!=#
+-session   optional     pam_loginuid.so
+-session   optional     pam_elogind.so
+#pkg#
 session    required     pam_unix.so
 #?pkg(sys-fs/ecryptfs-utils)!=#
 session    optional     pam_ecryptfs.so unwrap
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini b/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini
index 9eb1648f7..0856f978c 100644
--- a/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/0-ini
@@ -2,4 +2,4 @@
 
 [overlay-calculate]
 # Save the latest version, because when switching profile cl-setup-profile 3.2.2 makes a call cl-setup-system
-remerge = 20180409
+remerge = 20180412
diff --git a/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180412 b/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180412
new file mode 100644
index 000000000..f5dbdc18e
--- /dev/null
+++ b/profiles/templates/3.5/6_ac_update_sync/remerge/2018/20180412
@@ -0,0 +1,4 @@
+# Calculate format=samba name=ini.env ini(overlay-calculate.remerge)<#-cl_pass_file-# merge=sys-auth/pambase
+
+[overlay-calculate]
+remerge = #-cl_pass_file-#