diff --git a/xCAT/postscripts/getcredentials.awk b/xCAT/postscripts/getcredentials.awk
index 781dfc659..92d98a5d8 100755
--- a/xCAT/postscripts/getcredentials.awk
+++ b/xCAT/postscripts/getcredentials.awk
@@ -1,7 +1,7 @@
 #!/usr/bin/awk -f
 BEGIN {
         if (ENVIRON["USEOPENSSLFORXCAT"]) {
-            server = "openssl s_client -quiet -connect " ENVIRON["XCATSERVER"] " 2> /dev/null"
+            server = "openssl s_client -connect " ENVIRON["XCATSERVER"] " 2> /dev/null"
         } else {
             server = "/inet/tcp/0/127.0.0.1/400"
         }
@@ -16,6 +16,9 @@ BEGIN {
         print "</xcatrequest>" |& server
 
         while (server |& getline) {
+                if (match($0,/^\s*</)) {
+                  print $0
+                }
                 print $0 
                 if (match($0,"<serverdone>")) {
                   quit = "yes"
diff --git a/xCAT/postscripts/getpostscript.awk b/xCAT/postscripts/getpostscript.awk
index 14be03f59..29c40921f 100755
--- a/xCAT/postscripts/getpostscript.awk
+++ b/xCAT/postscripts/getpostscript.awk
@@ -1,7 +1,7 @@
 #!/usr/bin/awk -f
 BEGIN {
         if (ENVIRON["USEOPENSSLFORXCAT"]) {
-            server = "openssl s_client -quiet -connect " ENVIRON["XCATSERVER"] " 2> /dev/null"
+            server = "openssl s_client -connect " ENVIRON["XCATSERVER"] " 2> /dev/null"
         } else {
             server = "/inet/tcp/0/127.0.0.1/400"
         }
@@ -15,7 +15,9 @@ BEGIN {
         print "</xcatrequest>" |& server
 
         while (server |& getline) {
-                print $0 
+                if (match($0,/^\s*</)) {
+                  print $0 
+                }
                 if (match($0,"<serverdone>")) {
                   quit = "yes"
                 }