diff --git a/ChangeLog b/ChangeLog
index 87fd8e9f..6ea64098 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,7 +10,12 @@
                                -- ChangeLog --
 
 
+ngIRCd 0.7.x
+
+  - NJOIN propagates user channel modes correctly again ... Upsa.
+
 ngIRCd 0.7.0 (2003-05-01)
+
   - "ServerName" is checked better now: a dot (".") is required.
   - The KILL comand verifies and logs more parameters.
 
@@ -447,4 +452,4 @@ ngIRCd 0.0.1, 31.12.2001
 
 
 -- 
-$Id: ChangeLog,v 1.188.2.13 2003/05/01 10:15:02 alex Exp $
+$Id: ChangeLog,v 1.188.2.14 2003/07/09 18:53:08 alex Exp $
diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c
index eaa4f46c..e3428d96 100644
--- a/src/ngircd/irc-server.c
+++ b/src/ngircd/irc-server.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-server.c,v 1.32 2003/04/20 23:09:26 alex Exp $";
+static char UNUSED id[] = "$Id: irc-server.c,v 1.32.2.1 2003/07/09 18:53:08 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -344,6 +344,8 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req )
 			}
 
 			if( nick_out[0] != '\0' ) strlcat( nick_out, ",", sizeof( nick_out ));
+			if( is_op ) strlcat( nick_out, "@", sizeof( nick_out ));
+			if( is_voiced ) strlcat( nick_out, "+", sizeof( nick_out ));
 			strlcat( nick_out, ptr, sizeof( nick_out ));
 		}
 		else Log( LOG_ERR, "Got NJOIN for unknown nick \"%s\" for channel \"%s\"!", ptr, channame );