--- chan_h323.c.new	2004-12-15 12:26:31.000000000 -0500
+++ chan_h323.c	2004-12-14 13:49:41.000000000 -0500
@@ -832,6 +832,26 @@
 	struct oh323_user *u;
 	char iabuf[INET_ADDRSTRLEN];
 	u = userl.users;
+
+       ast_log(LOG_DEBUG, "Searching for user with IP (%s) for incoming call.\n", cd.sourceIp);
+
+
+
+        while (u) {
+                if (!strcasecmp(u->name, cd.sourceIp)) {
+                        break;
+                }
+        u = u->next;
+        }
+
+        if (u) {
+                ast_log(LOG_DEBUG, "Found user entry with IP (%s) of incoming call, using that.\n",cd.sourceIp);
+                return u;
+        } else {
+                u = userl.users;
+        }
+
+
 	if (userbyalias) {
 		while(u) {
 			if (!strcasecmp(u->name, cd.call_source_aliases)) {