diff --git a/mambawelcome/mambawelcome.sh b/mambawelcome/mambawelcome.sh
index a0a1d59..3b867f8 100755
--- a/mambawelcome/mambawelcome.sh
+++ b/mambawelcome/mambawelcome.sh
@@ -91,6 +91,12 @@ echo $"Configuring users and host" | tee -a $LOG_FILE
          sed -i "s|[#[:space:]]*autologin=.*|autologin=$INSTALL_USER|" \
             /etc/lxdm/lxdm.conf
       }
+      [ -e /etc/gdm/custom.conf ] && {
+         sed -i "s|[#[:space:]]*AutomaticLogin=.*|AutomaticLogin=$INSTALL_USER|" \
+            /etc/gdm/custom.conf
+         sed -i "s|AutomaticLoginEnable=.*|AutomaticLoginEnable=true|" \
+            /etc/gdm/custom.conf
+      }
    } || {
       [ -e /opt/kde/share/config/kdm/kdmrc ] &&
          sed -i "s|AutoLoginEnable=.*|AutoLoginEnable=false|" \
@@ -98,6 +104,9 @@ echo $"Configuring users and host" | tee -a $LOG_FILE
       [ -e /etc/lxdm/lxdm.conf ] && {
          sed -i "s|[#[:space:]]*\(autologin.*\)|#\1|" \
             /etc/lxdm/lxdm.conf
+      [ -e /etc/gdm/custom.conf ] &&
+         sed -i "s|AutomaticLoginEnable=.*|AutomaticLoginEnable=false|" \
+            /etc/gdm/custom.conf
    }
 
    # pre-create user homedir (currently just needed to put TODO txt files on