diff --git a/mm-scripts.sh b/mm-scripts.sh
index a5f2993..7341367 100755
--- a/mm-scripts.sh
+++ b/mm-scripts.sh
@@ -872,15 +872,26 @@ MMSETUP(){
 		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 ""	
+		
+		if [ "${EMAIL_NOTICE}" != ""]; then
+			read -n 1 -p "Use previous email address [${EMAIL_NOTICE}] (Y/n)?" choice
+			case "$choice" in 
+				[Nn]) 
+					echo
+					echo -e -n "${idsCL[LightCyan]}(optional) SMTP notification address: ${idsCL[Default]}"
+					read -e EMAIL_NOTICE
+					[ "${EMAIL_NOTICE}" != "" ] && echo "EMAIL_NOTICE=${EMAIL_NOTICE}" >> ${MMFOLDER}/settings.conf || echo "# EMAIL_NOTICE=email@address.com" >> ${MMFOLDER}/settings.conf
+					echo
+				;;
+			esac
+			[ "${EMAIL_NOTICE}" != "" ] && echo "EMAIL_NOTICE=${EMAIL_NOTICE}" >> ${MMFOLDER}/settings.conf || echo "# EMAIL_NOTICE=email@address.com" >> ${MMFOLDER}/settings.conf
+		fi
+		
+		
+		
 		echo -e -n "${idsCL[LightCyan]}(optional) Pushover App Token: ${idsCL[Default]}"
 		read -e PUSHOVER_APP_TOKEN
 		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
@@ -890,17 +901,12 @@ MMSETUP(){
 				echo "# PUSHOVER_APP_TOKEN=\"\"" >> ${MMFOLDER}/settings.conf
 				echo "# PUSHOVER_USER_TOKEN=\"\"" >> ${MMFOLDER}/settings.conf				
 			fi
-			 
 		 else
 			echo "# PUSHOVER_APP_TOKEN=\"\"" >> ${MMFOLDER}/settings.conf
 			echo "# PUSHOVER_USER_TOKEN=\"\"" >> ${MMFOLDER}/settings.conf	
-			
 		 fi
-		 
 		echo
-	
-		#echo -e " EMAIL_NOTICE=${SMTPADDRESS}\n PUSHOVER_APP_TOKEN=\"${PUSHOVER_APP_TOKEN}\"\n PUSHOVER_USER_TOKEN=\"${PUSHOVER_USER_TOKEN}\""
-	
+			
 		cat	${MMFOLDER}/settings.conf
 		
 		;;