diff --git a/package/base/pam/pam.conf b/package/base/pam/pam.conf
index e17ad81be..e369fcc1a 100644
--- a/package/base/pam/pam.conf
+++ b/package/base/pam/pam.conf
@@ -38,6 +38,7 @@ install_pam_configs() {
 	else
 		touch $root/etc/pam.d/other
 	fi
+	cp $root/etc/pam.d/other $root/etc/pam.d/system-auth
 }
 
 # Install default pam.d/* files (without them,
diff --git a/package/base/shadow/shadow.conf b/package/base/shadow/shadow.conf
index 5af99a814..23038c232 100644
--- a/package/base/shadow/shadow.conf
+++ b/package/base/shadow/shadow.conf
@@ -43,6 +43,7 @@ pm_shadow() {
 	[ -f $root/usr/bin/su    ] && mv $root/usr/bin/su     $root/bin/
 	mkdir -p $root/etc/default
 	echo 'SHELL=/bin/bash' > $root/etc/default/useradd
+	sed -e 's,^\(.*loginuid\),#\1,' -i ${root}/etc/pam.d/login
 }
 
 preconf="pc_shadow"
diff --git a/package/kde/kdebase/kdebase.conf b/package/kde/kdebase/kdebase.conf
index 7fee0a537..8471ba1d4 100644
--- a/package/kde/kdebase/kdebase.conf
+++ b/package/kde/kdebase/kdebase.conf
@@ -50,6 +50,8 @@ kde_base_pi()
 	# Set's aRts as the default soundsystem, prevents the 
 	# "CPU overload" errors
 	cp -fv $confdir/kcmartsrc $root/$prefix/share/config/
+
+	sed -e 's,^\(.*loginuid\),#\1,' -i ${root}/etc/pam.d/kde*
 }
 
 hook_add postinstall 3 "kde_base_pi"