diff --git a/ChangeLog b/ChangeLog
index 9f120ccc0..3de204efe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+jilles      2007/11/17 21:55:48 UTC	(20071117-3582)
+  Log:
+  Update description of oper privileges a bit.
+  
+
+  Changes:	Modified:
+  +3 -3		trunk/doc/example.conf (File Modified) 
+  +3 -3		trunk/doc/reference.conf (File Modified) 
+
+
 jilles      2007/11/07 23:45:14 UTC	(20071107-3580)
   Log:
   Fix desyncs with very long extbans. Bans can now be upto 195 chars long.
diff --git a/include/serno.h b/include/serno.h
index 10913c04c..bfe531f8f 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20071107-3580"
+#define SERNO "20071117-3582"
diff --git a/src/s_user.c b/src/s_user.c
index 6e25ced11..ce4e3eca3 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: s_user.c 3542 2007-08-01 20:18:12Z jilles $
+ *  $Id: s_user.c 3584 2007-11-20 11:08:23Z nenolod $
  */
 
 #include "stdinc.h"
@@ -464,6 +464,8 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 				     "Invalid username: %s (%s@%s)",
 				     source_p->name, source_p->username, source_p->host);
 		ServerStats->is_ref++;
+		sendto_one_notice(source_p, ":*** Your username is invalid. Please make sure that your username contains "
+					    "only alphanumeric characters.");
 		ircsprintf(tmpstr2, "Invalid username [%s]", source_p->username);
 		exit_client(client_p, source_p, &me, tmpstr2);
 		return (CLIENT_EXITED);