diff --git a/src/eldap/eldap_filter.erl b/src/eldap/eldap_filter.erl
index 51dac5ec7..341fba13a 100644
--- a/src/eldap/eldap_filter.erl
+++ b/src/eldap/eldap_filter.erl
@@ -171,7 +171,7 @@ do_sub(S, {RegExp, New, Times}, Iter) ->
     end.
 
 replace_amps(String) ->
-    lists:map(
+    lists:flatmap(
       fun($&) -> "\\&";
-	 (Chr) -> Chr
+	 (Chr) -> [Chr]
       end, String).