diff --git a/ublinux/rc.preinit.d/51-autologin b/ublinux/rc.preinit.d/51-autologin
index 2864087..d9f37f6 100755
--- a/ublinux/rc.preinit.d/51-autologin
+++ b/ublinux/rc.preinit.d/51-autologin
@@ -21,7 +21,7 @@ SOURCE=${SYSCONF}/config; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null
 SOURCE=${SYSCONF}/desktop; [[ -f ${SOURCE} ]] && . ${SOURCE} 2>/dev/null
 
     PASS_ADMUID=$(grep "^$(grep ":${ADMUID}:${ADMUID}:" ${ROOTFS}/etc/passwd | cut -d: -f1):" ${ROOTFS}/etc/shadow | cut -d: -f2) #"
-    [[ ${PASS_ADMUID} == ${NOSECUREROOTPASSWD} && ${PASS_ADMUID} == ${DEFAULTPASSWD} ]] && echo "AUTOLOGINUSER=yes" >>  ${SYSCONF}/desktop
+    [[ ${PASS_ADMUID} == ${NOSECUREROOTPASSWD} && ${PASS_ADMUID} == ${DEFAULTPASSWD} ]] && echo "AUTOLOGINUSER=yes" >>  ${SYSCONF}/desktop && AUTOLOGINUSER=yes
     AUTOLOGINUSER_CMDLINE=$(cmdline_value autologin) && [[ -n ${AUTOLOGINUSER_CMDLINE} ]] && AUTOLOGINUSER=${AUTOLOGINUSER_CMDLINE}
     
     if [[ -z "${AUTOLOGINUSER}" ]]; then
diff --git a/ublinux/rc.preinit/02-skel-adds b/ublinux/rc.preinit/02-skel-adds
index bbe59a7..a1ffe38 100755
--- a/ublinux/rc.preinit/02-skel-adds
+++ b/ublinux/rc.preinit/02-skel-adds
@@ -17,7 +17,7 @@ debug_mode "$0" "$@"
 INSTALLDESKTOP="ubinstall;ubinstall.cli"
 echo "${INSTALLDESKTOP}" | tr ',;' \\n | while read i; do
     if [[ -f usr/share/applications/"${i}".desktop ]]; then
-	if ! [[ -w /memory/layer-base/0 || -d /mnt/livedata || -w /mnt/livemedia ]] || grep -q "ub.sgnfiles=.*-iso.sgn" /proc/cmdline; then
+	if ! [[ -w /memory/layer-base/0 || -d /mnt/livedata || -w /mnt/livemedia ]] || grep -q ".*-iso.sgn" <<< $(cmdline_value ub.sgnfiles); then
 	    if ! grep -q ^Hidden=true usr/share/applications/"${i}".desktop ; then
 #		DESKTOPNAME=$(chroot . bash -c "xdg-user-dirs-update && xdg-user-dir DESKTOP | cut -d/ -f3")
 		DESKTOPNAME=$(chroot . gettext -d xdg-user-dirs "Desktop")