diff --git a/mm-scripts.sh b/mm-scripts.sh
index 4ef10a4..505e5f9 100755
--- a/mm-scripts.sh
+++ b/mm-scripts.sh
@@ -851,7 +851,6 @@ MMSETUP(){
 		sed -i '/PUSHOVER_/d' ${MMFOLDER}/settings.conf
 		sed -i '/EMAIL_NOTICE/d' ${MMFOLDER}/settings.conf
 		sed -i '/OPTIONAL/d' ${MMFOLDER}/settings.conf
-		sed -i '/##/d' ${MMFOLDER}/settings.conf
 		sed -i '/^$/d' ${MMFOLDER}/settings.conf
 		echo -e "${idsCL[Green]}Done${idsCL[Default]}"
 		
@@ -880,12 +879,23 @@ MMSETUP(){
 		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
-	
+		if [ "${PUSHOVER_APP_TOKEN}" != "" ]; then
+			 
+	 		echo -e -n "${idsCL[LightCyan]}(optional) Pushover User Token: ${idsCL[Default]}"
+	 		read -e PUSHOVER_USER_TOKEN
+	 		if [ "${PUSHOVER_USER_TOKEN}" != "" ]; then
+				echo "PUSHOVER_APP_TOKEN=\"${PUSHOVER_APP_TOKEN}\"" >> ${MMFOLDER}/settings.conf
+				echo "PUSHOVER_USER_TOKEN=\"${PUSHOVER_USER_TOKEN}\"" >> ${MMFOLDER}/settings.conf
+			else
+				echo "# PUSHOVER_APP_TOKEN=\"\"" >> ${MMFOLDER}/settings.conf
+				echo "# PUSHOVER_USER_TOKEN=\"\"" >> ${MMFOLDER}/settings.conf				
+			fi
+			 
+		 else
+
+
+		 fi
+		 
 		echo
 	
 		#echo -e " EMAIL_NOTICE=${SMTPADDRESS}\n PUSHOVER_APP_TOKEN=\"${PUSHOVER_APP_TOKEN}\"\n PUSHOVER_USER_TOKEN=\"${PUSHOVER_USER_TOKEN}\""