diff --git a/pym/cl_datavars.py b/pym/cl_datavars.py
index cdf7173..ad617c7 100644
--- a/pym/cl_datavars.py
+++ b/pym/cl_datavars.py
@@ -645,16 +645,20 @@ storage of variables templates")%location)
                                        " " + _("Mode") + " " +_("Value"))
             cl_overriding.printSUCCESS(br)
             for i in plist:
-                p_val=var[i].value
-                if var[i].official:
-                    continue
-                columnWrite( i, mlen_name, var[i].mode.lower(), mlen_mode, p_val)
+                if i.endswith("_pw"):
+                    p_val = "***"
+                else:
+                    p_val=var[i].value
+                columnWrite(i, mlen_name, var[i].mode.lower(), mlen_mode, p_val)
             cl_overriding.printSUCCESS(br)
         elif outFormat == "xml":
             xmlObj = _varsXML()
             varNames = sorted(var.keys())
             for name in varNames:
-                value = var[name].value
+                if name.endswith("_pw"):
+                    value = "***"
+                else:
+                    value = var[name].value
                 typeVar = type(value) 
                 if typeVar in (str, int, float):
                     xmlObj.addVar(name, value)