diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 3dbb3f44..b0b53b14 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -622,7 +622,7 @@ LISTCERTS(){
 		declare -i cw; declare -i spc1; declare -i c
 		c=0; cw=26; spc=''
 		spc1=${cw}-${#SUBJECT}
-		echo "${c}-${cw}-${#SUBJECT}-${spc1}"
+		echo "${c}-${cw}-${#SUBJECT}-'${SUBJECT}'-${spc1}"
 		until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
 		echo 'yes-b'
 		if [ $DUEIN -gt $CERTEXPIRE ]; then
@@ -633,7 +633,7 @@ LISTCERTS(){
 		echo 'yes1'
 		
 		if [ "${CHECKCERT_DOMAINS[${SUBJECT}]}" = "" ]; then
-			SUBJECT_DISP=${SUBJECT}
+			SUBJECT_DISP="${SUBJECT}"
 		else
 			SUBJECT_DISP="${idsBG[Green]}${idsCL[White]}${SUBJECT}${idsBG[Default]}${idsCL[Cyan]}"
 			spc="${idsBG[Green]}"