diff --git a/Changes b/Changes
index 08ab2d640..515d2a4e4 100644
--- a/Changes
+++ b/Changes
@@ -8,6 +8,9 @@ Provided by Anope Dev. <dev@anope.org> - 2005
 11/01 F /os reload - BSFantasyChar was not sstrduped if not defined.      [ #00]
 10/30 F Updated docs/FAQ.                                                 [ #00]
 
+Provided by Trystan <trystan@nomadirc.net> - 2005
+11/19 F find_byuid for ircds which didnt give us a uid.                   [ #00]
+
 Anope Version 1.7.12
 --------------------
 Provided by Anope Dev. <dev@anope.org> - 2005
diff --git a/src/users.c b/src/users.c
index e3684a6b6..539de2089 100644
--- a/src/users.c
+++ b/src/users.c
@@ -385,9 +385,11 @@ User *find_byuid(const char *uid)
     u = first_uid();
     while (u) {
         next = next_uid();
-        if (!stricmp(uid, u->uid)) {
-            return u;
-        }
+	if(u->uid) {
+            if (!stricmp(uid, u->uid)) {
+                return u;
+            }
+	}
         u = next;
     }
     return NULL;