diff --git a/inc/certs.inc b/inc/certs.inc
index 6004ad04..0c62c2d7 100755
--- a/inc/certs.inc
+++ b/inc/certs.inc
@@ -309,7 +309,7 @@ LISTCERTS(){
 				SUBJECTNAMES=${SUBJECTNAMES//$'\n'/, }
 				# SUBJECTNAMES=$(echo $SUBJECTNAMES | sed "s/\n/, /g")
 				SUBJECTNAMES=$(echo $SUBJECTNAMES | sed "s/${SUBJECT}, //g")
-				SUBJECTNAMES=$(echo $SUBJECTNAMES | sed "s/,${SUBJECT}//g")
+				SUBJECTNAMES=$(echo $SUBJECTNAMES | sed "s/, ${SUBJECT}//g")
 				SUBJECTNAMES=$(echo $SUBJECTNAMES | sed "s/${SUBJECT}//g")
 				
 				[[ "$(declare -p CHECKCERT_DOMAINS)" =~ "declare -a" ]] && [ "${CHECKCERT_DOMAINS[${SUBJECT}]}" = "" ] && monitored='-' || monitored="Yes"
@@ -335,7 +335,7 @@ LISTCERTS(){
 					    case "${editc}" in
 							1)  echo -e "\033[K\n\033[K"
 								echo -en "\033[KEnter new Alternate Names: "
-								read  -i "${SUBJECTNAMES}" -e newnames
+								read  -i "${SUBJECTNAMES//, /,}" -e newnames
 								echo -e "\033[5A"; for (( c=1; c<=5; c++ )); do echo -e "\033[K"; done; echo -e "\033[5A"
 								;;
 					        2) [ "${monitored}" == "-" ] && monitored='Yes' || monitored='-';;