diff --git a/hsarback/src/de/hsadmin/core/qserv/CommandShell.java b/hsarback/src/de/hsadmin/core/qserv/CommandShell.java
index cfee80f..363b42a 100644
--- a/hsarback/src/de/hsadmin/core/qserv/CommandShell.java
+++ b/hsarback/src/de/hsadmin/core/qserv/CommandShell.java
@@ -24,8 +24,14 @@ public class CommandShell {
 		int exitCode = 0;
 		try {
 			String logCommand = command;
-			if (stdInput != null)  {
-				logCommand += "<<EOF\n" + stdInput + "EOF";
+			if (stdInput != null && !"newusers".equals(logCommand))  {
+				if (logCommand != null && (logCommand.startsWith("newusers") || logCommand.startsWith("chpasswd"))) {
+					// escape new password !
+					final String[] strings = stdInput.split(":", 3);
+					logCommand += "<<EOF\n" + strings[0] + ":***:" + strings[2] + "EOF";
+				} else {
+					logCommand += "<<EOF\n" + stdInput + "EOF";
+				}
 			}
 			logCommand += "\n";
 			logger.log(Level.INFO, logCommand);