diff --git a/ChangeLog b/ChangeLog
index 8091fa647104b29f48f70be5190927cb3f50d8ce..52fb24e0a0be91be0344dd0ab5bfd7f149ce2d40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 train-2012.06.08 (in progress):
-  *
+  * Support non-english passwords: issue #1631
 
 train-2012.05.25:
   * many KPI improvements: #1597, #1613
diff --git a/lib/http_forward.js b/lib/http_forward.js
index d88cbd85de18c4f97f85fbb563fc0929dc05c30d..819142ee8332f24a0ef41fe0cce6e9a1cb93d034 100644
--- a/lib/http_forward.js
+++ b/lib/http_forward.js
@@ -93,7 +93,7 @@ exports.forward = function(dest, req, res, cb) {
     var data;
     if (req.headers['content-type'].indexOf('application/json') === 0) data = JSON.stringify(req.body);
     else data = querystring.stringify(req.body);
-    preq.setHeader('content-length', data.length);
+    preq.setHeader('content-length', Buffer.byteLength(data));
     preq.write(data);
     preq.end();
   } else {