diff --git a/server/src/com/cloud/api/ApiServlet.java b/server/src/com/cloud/api/ApiServlet.java
index b5c42725104..091bf189cc2 100755
--- a/server/src/com/cloud/api/ApiServlet.java
+++ b/server/src/com/cloud/api/ApiServlet.java
@@ -36,6 +36,7 @@ import com.cloud.server.ManagementServer;
 import com.cloud.user.Account;
 import com.cloud.user.AccountService;
 import com.cloud.user.UserContext;
+import com.cloud.utils.StringUtils;
 import com.cloud.utils.component.ComponentLocator;
 import com.cloud.utils.exception.CloudRuntimeException;
 
@@ -126,7 +127,7 @@ public class ApiServlet extends HttpServlet {
         String reqStr = "";
         if (s_logger.isDebugEnabled()) {
             reqStr = auditTrailSb.toString() + " " + req.getQueryString();
-            s_logger.debug("===START=== " + reqStr);
+            s_logger.debug("===START=== " + StringUtils.cleanString(reqStr));
         }
         
         try {
@@ -343,7 +344,7 @@ public class ApiServlet extends HttpServlet {
         } finally {
             s_accessLogger.info(auditTrailSb.toString());
             if (s_logger.isDebugEnabled()) {
-                s_logger.debug("===END=== " + reqStr);
+                s_logger.debug("===END=== " + StringUtils.cleanString(reqStr));
             }
             // cleanup user context to prevent from being peeked in other request context
             UserContext.unregisterContext();