diff --git a/ChangeLog b/ChangeLog
index 3f2bd450a..52e4c80b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-21  Pablo Polvorin  <pablo.polvorin@process-one.net>
+
+	* src/mod_roster.erl: Bugfix in remove_user/2: values already
+	in binary() format.
+
 2009-02-21  Badlop  <badlop@process-one.net>
 
 	* src/ejabberd_auth.erl: Password is undefined when using digest
diff --git a/src/mod_roster.erl b/src/mod_roster.erl
index c4d6237e0..65cf56ef2 100644
--- a/src/mod_roster.erl
+++ b/src/mod_roster.erl
@@ -685,8 +685,8 @@ in_auto_reply(_,    _,    _)  ->           none.
 remove_user(User, Server) 
   when is_binary(User), is_binary(Server) ->
     try
-	LUser = list_to_binary(exmpp_stringprep:nodeprep(User)),
-	LServer = list_to_binary(exmpp_stringprep:nameprep(Server)),
+	LUser = exmpp_stringprep:nodeprep(User),
+	LServer = exmpp_stringprep:nameprep(Server),
 	US = {LUser, LServer},
 	F = fun() ->
 		    lists:foreach(fun(R) ->