diff --git a/ChangeLog b/ChangeLog
index 42a3ef488..42e94dc4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-02-19  Mickael Remond  <mickael.remond@process-one.net>
 
+	* src/cyrsasl_plain.erl: bad-auth error code replaced by not-authorized
+	(EJAB-187).
+	
 	* src/aclocal.m4: configure --with-erlang option is now working (Thanks
 	to Jerome Sautret) (EJAB-186).
 
diff --git a/src/cyrsasl_plain.erl b/src/cyrsasl_plain.erl
index e58e1cc22..59f88bf25 100644
--- a/src/cyrsasl_plain.erl
+++ b/src/cyrsasl_plain.erl
@@ -33,7 +33,7 @@ mech_step(State, ClientIn) ->
 		true ->
 		    {ok, [{username, User}, {authzid, AuthzId}]};
 		_ ->
-		    {error, "bad-auth"}
+		    {error, "not-authorized"}
 	    end;
 	_ ->
 	    {error, "bad-protocol"}