diff --git a/installer.sh b/installer.sh
index c48b075..c3af29b 100644
--- a/installer.sh
+++ b/installer.sh
@@ -66,6 +66,7 @@ domain=$(whiptail --nocancel --inputbox "                        Enter the domai
 if (whiptail --title "Config" --yesno "Does www.${domain} exist in DNS" 8 78); then domainwww=1; else domainwww=1; fi
 if (whiptail --title "Config" --yesno "Hostname with nxdi.nl" 11 82); then
     hostname=$(whiptail --nocancel --inputbox "                      SystemID (eg: VCH001) without ".nxdi.nl"     " 11 82 --title "Config" 3>&1 1>&2 2>&3)
+    hostname=$hostname".nxdi.nl"
 else
     hostname=$(whiptail --nocancel --inputbox "                      Hostname     " 11 82 --title "Config" 3>&1 1>&2 2>&3)
 fi
@@ -248,6 +249,7 @@ done
 if [ $IMODE = n ]; then
 function CMSM {
 CMS=$(whiptail --nocancel --title "What CMS should be installed?" --radiolist "Features" 11 118 5 "Nextcloud:" "Nextcloud is a suite of client-server software for creating and using file hosting services." OFF "Wordpress:" "WordPress is a content management system based on PHP." OFF "None:" "A plain webserver will be setup." OFF 3>&1 1>&2 2>&3)
+if [ -z $CMS ]; then CMSM; fi
 }
 CMSM
 fi