diff --git a/mm-scripts.sh b/mm-scripts.sh
index 73d4301..3d0b6b7 100755
--- a/mm-scripts.sh
+++ b/mm-scripts.sh
@@ -1114,7 +1114,7 @@ MMSETUP(){
 	esac
 	
 	echo
-	echo -en "${idsCL[LightCyan]}This will reset the MM app config, do you wish to continue (y/N)? ${idsCL[Default]}"
+	echo -en "${idsCL[LightCyan]}Do you wish to change enabled services (y/N)? ${idsCL[Default]}"
 	read -n 1 choice
 	case "$choice" in 
 		[Yy])
@@ -1165,9 +1165,25 @@ MMSETUP(){
 				echo -e "\n# SERVICESCHECK=\n\n#[OPTIONAL]" >> ${MMFOLDER}/settings.conf
 			fi
 	
+			echo
+			
+			source /opt/idssys/mediamanager/settings.conf
+			IFS=,; SERVICES_CHECK=(${SERVICESCHECK}); unset IFS
+			
+			CNFG=true
+			
+		;;
+	esac
+	
+	
+	echo
+	echo -en "${idsCL[LightCyan]}Would you like to configure notications (y/N)? ${idsCL[Default]}"
+	read -n 1 choice
+	case "$choice" in 
+		[Yy])
 			echo
 			echo -e "${idsCL[LightCyan]}You may choose to setup notifications by either SMTP and/or Pushover:${idsCL[Default]}"
-		
+			echo
 			if [ "${EMAIL_NOTICE}" != "" ]; then
 				echo -en "${idsCL[LightYellow]}Use previous email address [${idsCL[White]}${EMAIL_NOTICE}${idsCL[LightYellow]}] (Y/n)? ${idsCL[Default]}"
 				read -n 1 choice
@@ -1214,20 +1230,8 @@ MMSETUP(){
 			source /opt/idssys/mediamanager/settings.conf
 			IFS=,; SERVICES_CHECK=(${SERVICESCHECK}); unset IFS
 			
-			echo
-			echo -en "${idsCL[LightCyan]}Would you like to update media management services (y/N)? ${idsCL[Default]}"
-			read -n 1 choice
-			case "$choice" in
-				[Yy]) for usrvc in "${UPDATE_SERVICES[@]}"; do
-						[ "${MM_UPDATE_REPO[${usrvc}]}" != "" ] && UPDATESERVICE ${usrvc}
-					done;;
-				* ) tmp='';;
-			esac
-			
 			CNFG=true
-			
-		;;
-	*)	tmp='';;
+			;;
 	esac
 	
 	
@@ -1317,6 +1321,15 @@ MMSETUP(){
 				* ) reboot;;
 			esac
 		else
+			echo
+			echo -en "${idsCL[LightCyan]}Would you like to update media management services (y/N)? ${idsCL[Default]}"
+			read -n 1 choice
+			case "$choice" in
+				[Yy]) for usrvc in "${UPDATE_SERVICES[@]}"; do
+						[ "${MM_UPDATE_REPO[${usrvc}]}" != "" ] && UPDATESERVICE ${usrvc}
+					done;;
+				* ) tmp='';;
+			esac			
 			echo
 			echo -en "${idsCL[LightCyan]}Would you like to start media management services (y/N)? ${idsCL[Default]}"
 			read -n 1 choice