diff --git a/src/main/java/com/eactive/eai/adapter/service/DJBApiAdapterService.java b/src/main/java/com/eactive/eai/adapter/service/DJBApiAdapterService.java
index 74fe8ac..0489f3f 100644
--- a/src/main/java/com/eactive/eai/adapter/service/DJBApiAdapterService.java
+++ b/src/main/java/com/eactive/eai/adapter/service/DJBApiAdapterService.java
@@ -546,10 +546,13 @@ public class DJBApiAdapterService extends HttpAdapterServiceSupport {
 						if (valueNode.isTextual()) {
 							String value = valueNode.asText();
 
-							if (fieldEntry.getKey().equalsIgnoreCase("content-type")) {
+							if (StringUtils.equalsIgnoreCase(fieldEntry.getKey(), "content-type")) {
 								logger.debug("set content-type {}: {}", fieldEntry.getKey(), value);
 								response.setContentType(value);
-							} else {
+							} else if (StringUtils.equalsIgnoreCase(fieldEntry.getKey(), HttpHeaders.CONTENT_LENGTH)) {
+								logger.debug("skip content-length {}: {}", fieldEntry.getKey(), value);
+								continue;
+				            } else {
 								logger.debug("add header {}: {}", fieldEntry.getKey(), value);
 								response.addHeader(fieldEntry.getKey(), value);
 							}
@@ -577,8 +580,12 @@ public class DJBApiAdapterService extends HttpAdapterServiceSupport {
             				String value = headerElement.getTextTrim();
 
             				if(StringUtils.isNoneBlank(value)) {
-            					if(value.equalsIgnoreCase("content-type")) {
-            						response.setContentType(value);
+            					if(StringUtils.equalsIgnoreCase(name, "content-type")) {
+            						logger.debug("set content-type {}: {}", name, value);
+    								response.setContentType(value);
+            					} else if(StringUtils.equalsIgnoreCase(name, "content-length")) {
+            						logger.debug("skip content-length {}: {}", name, value);
+    								continue;
             					} else {
             						logger.debug("add header {}: {}", name, value);
             						response.addHeader(name, value);
@@ -683,7 +690,7 @@ public class DJBApiAdapterService extends HttpAdapterServiceSupport {
                 if (sb.length() > 0) sb.append(", ");
                 sb.append(values.nextElement());
             }
-            prop.setProperty(key, sb.toString());
+            prop.setProperty(key.toLowerCase(), sb.toString());
         }
 
         return prop;