diff --git a/mambawelcome/mambawelcome.sh b/mambawelcome/mambawelcome.sh
index 3adc4d2..fb30af9 100755
--- a/mambawelcome/mambawelcome.sh
+++ b/mambawelcome/mambawelcome.sh
@@ -87,10 +87,17 @@ echo $"Configuring users and host" | tee -a $LOG_FILE
          sed -i "s|AutoLoginUser=.*|AutoLoginUser=$INSTALL_USER|" \
             /opt/kde/share/config/kdm/kdmrc      
       }
+      [ -e /etc/lxdm/lxdm.conf ] && {
+         sed -i "s|[#[:space:]]*autologin=.*|autologin=$INSTALL_USER|" \
+            /etc/lxdm/lxdm.conf
+      }
    } || {
       [ -e /opt/kde/share/config/kdm/kdmrc ] &&
          sed -i "s|AutoLoginEnable=.*|AutoLoginEnable=false|" \
             /opt/kde/share/config/kdm/kdmrc
+      [ -e /etc/lxdm/lxdm.conf ] && {
+         sed -i "s|[#[:space:]]*\(autologin.*\)|#\1|" \
+            /etc/lxdm/lxdm.conf
    }
 
    # pre-create user homedir (currently just needed to put TODO txt files on