3 files changed, 9 insertions, 4 deletions
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 15c1314b7..6ebe3ff85 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1761,7 +1761,9 @@ void charybdis_cmd_jupe(char *jserver, char *who, char *reason)
 */
 int charybdis_valid_nick(char *nick)
 {
-    /* no hard coded invalid nicks */
+    /* TS6 Save extension -Certus */
+    if (isdigit(*nick))
+        return 0;
     return 1;
 }
 
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index abdc7f0ca..9fbe537cc 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -1727,8 +1727,9 @@ void ratbox_cmd_jupe(char *jserver, char *who, char *reason)
 */
 int ratbox_valid_nick(char *nick)
 {
-    /* no hard coded invalid nicks */
-    return 1;
+    /* TS6 Save extension -Certus */
+    if (isdigit(*nick))
+        return 0;
 }
 
 /* 
diff --git a/src/protocol/shadowircd.c b/src/protocol/shadowircd.c
index 7d1982e35..8e2a69c24 100644
--- a/src/protocol/shadowircd.c
+++ b/src/protocol/shadowircd.c
@@ -1675,7 +1675,9 @@ void shadowircd_cmd_jupe(char *jserver, char *who, char *reason)
 */
 int shadowircd_valid_nick(char *nick)
 {
-    /* no hard coded invalid nicks */
+    /* TS6 Save extension -Certus */
+    if (isdigit(*nick))
+        return 0;
     return 1;
 }