diff --git a/inc/certs.inc b/inc/certs.inc
index 2eaf4a4c..0b027eab 100755
--- a/inc/certs.inc
+++ b/inc/certs.inc
@@ -626,10 +626,19 @@ UPGRADECERTS(){
 	
 	i=1
 	for certdir in ${ssldir[@]}; do
+		SUBJECT=$(${NCMD} openssl x509 -in ${certdir}/cert.pem -noout -subject|grep -oP '(?<=CN = )[^,]+'|sort -uV)
 		SUBJECTNAMES=$(${NCMD} openssl x509 -in ${certdir}/cert.pem -noout -text|grep -oP '(?<=DNS:|IP Address:)[^,]+'|sort -uV)
 		SUBJECTNAMES=${SUBJECTNAMES//$'\n'/, }
-		SUBJECTNAMES=${SUBJECTNAMES//, /,}
-		echo "$certdir = $SUBJECTNAMES "
+		# 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")
+		if [ "${SUBJECTNAMES}" == "" ]; then
+			allnames=${SUBJECT}
+		else
+			allnames="${SUBJECT},$SUBJECTNAMES"
+		fi
+		echo "$certdir = $allnames "
 	done
 }