diff --git a/mambawelcome/mambawelcome.sh b/mambawelcome/mambawelcome.sh
index 4a9d2b9..2698dee 100755
--- a/mambawelcome/mambawelcome.sh
+++ b/mambawelcome/mambawelcome.sh
@@ -79,7 +79,7 @@ echo $"Configuring users and host" | tee -a $LOG_FILE
    }
 
    # configure user for autologin
-   [ "$INSTALL_USER_AUTOLOGIN" = "1" ] && {
+   if [ "$INSTALL_USER_AUTOLOGIN" = "1" ]; then
       echo $"Info: enabling user autologin" | tee -a $LOG_FILE
       [ -e /opt/kde/share/config/kdm/kdmrc ] && {
          sed -i "s|AutoLoginEnable=.*|AutoLoginEnable=true|" \
@@ -97,7 +97,7 @@ echo $"Configuring users and host" | tee -a $LOG_FILE
          sed -i "s|AutomaticLoginEnable=.*|AutomaticLoginEnable=true|" \
             /etc/gdm/custom.conf
       }
-   } || {
+   else
       [ -e /opt/kde/share/config/kdm/kdmrc ] &&
          sed -i "s|AutoLoginEnable=.*|AutoLoginEnable=false|" \
             /opt/kde/share/config/kdm/kdmrc
@@ -107,7 +107,7 @@ echo $"Configuring users and host" | tee -a $LOG_FILE
       [ -e /etc/gdm/custom.conf ] &&
          sed -i "s|AutomaticLoginEnable=.*|AutomaticLoginEnable=false|" \
             /etc/gdm/custom.conf
-   }
+   fi
 
    # pre-create user homedir (currently just needed to put TODO txt files on
    # desktop)