diff --git a/mm-scripts.sh b/mm-scripts.sh
index 719224d..22b8e9b 100755
--- a/mm-scripts.sh
+++ b/mm-scripts.sh
@@ -855,21 +855,27 @@ MMSETUP(){
 	"sonarr" "Sonarr (TV Show Manager)" ON \
 	"tautulli" "Tautulli (Plex Stats)" ON 3>&1 1>&2 2>&3)
 	exitstatus=$?; srvcs="$(join_by , $srvcs)"; srvcs=${srvcs/tautulli/snap.tautulli.tautulli}
-	echo "SERVICESCHECK=${srvcs}" >> ${MMFOLDER}/settings.conf
+	echo -e "SERVICESCHECK=${srvcs}\n\n#[OPTIONAL]" >> ${MMFOLDER}/settings.conf
 	
 	echo
 	echo -e "${idsCL[LightCyan]}You may choose to setup notifications by either SMTP and/or Pushover:${idsCL[Default]}"
 	echo
 	echo -e -n "${idsCL[LightCyan]}(optional) SMTP notification address: ${idsCL[Default]}"
 	read -e SMTPADDRESS
+	[ "${SMTPADDRESS}" != "" ] && echo "EMAIL_NOTICE=${SMTPADDRESS}" >> ${MMFOLDER}/settings.conf || echo "# EMAIL_NOTICE=email@address.com" >> ${MMFOLDER}/settings.conf
+	
 	echo ""	
 	echo -e -n "${idsCL[LightCyan]}(optional) Pushover App Token: ${idsCL[Default]}"
 	read -e PUSHOVER_APP_TOKEN
+	[ "${PUSHOVER_APP_TOKEN}" != "" ] && echo "PUSHOVER_APP_TOKEN=\"${PUSHOVER_APP_TOKEN}\"" >> ${MMFOLDER}/settings.conf || echo "# PUSHOVER_APP_TOKEN=\"\"" >> ${MMFOLDER}/settings.conf
+	
 	echo -e -n "${idsCL[LightCyan]}(optional) Pushover User Token: ${idsCL[Default]}"
 	read -e PUSHOVER_USER_TOKEN
+	[ "${PUSHOVER_USER_TOKEN}" != "" ] && echo "PUSHOVER_USER_TOKEN=\"${PUSHOVER_USER_TOKEN}\"" >> ${MMFOLDER}/settings.conf || echo "# PUSHOVER_USER_TOKEN=\"\"" >> ${MMFOLDER}/settings.conf
+	
 	echo
 	
-	echo -e "EMAIL_NOTICE=${SMTPADDRESS}\nPUSHOVER_APP_TOKEN=\"${PUSHOVER_APP_TOKEN}\"\nPUSHOVER_USER_TOKEN=\"${PUSHOVER_USER_TOKEN}\"" >> ${MMFOLDER}/settings.conf
+	echo -e " EMAIL_NOTICE=${SMTPADDRESS}\n PUSHOVER_APP_TOKEN=\"${PUSHOVER_APP_TOKEN}\"\n PUSHOVER_USER_TOKEN=\"${PUSHOVER_USER_TOKEN}\""
 "
 	
 	cat	${MMFOLDER}/settings.conf