diff --git a/ircd/s_conf.c b/ircd/s_conf.c
index bc44cb69..406e7103 100644
--- a/ircd/s_conf.c
+++ b/ircd/s_conf.c
@@ -200,10 +200,10 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
 		 * see the IP, we still cannot send it.
 		 */
 		sendto_realops_snomask(SNO_FULL, L_NETWIDE,
-				"Too many local connections for %s!%s%s@%s",
+				"Too many local connections for %s[%s%s@%s] [%s]",
 				source_p->name, IsGotId(source_p) ? "" : "~",
-				source_p->username,
-				show_ip(NULL, source_p) && !IsIPSpoof(source_p) ? source_p->sockhost : source_p->host);
+				source_p->username, source_p->host,
+				show_ip(NULL, source_p) && !IsIPSpoof(source_p) ? source_p->sockhost : "0");
 
 		ilog(L_FUSER, "Too many local connections from %s!%s%s@%s",
 			source_p->name, IsGotId(source_p) ? "" : "~",
@@ -215,10 +215,10 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
 
 	case TOO_MANY_GLOBAL:
 		sendto_realops_snomask(SNO_FULL, L_NETWIDE,
-				"Too many global connections for %s!%s%s@%s",
+				"Too many global connections for %s[%s%s@%s] [%s]",
 				source_p->name, IsGotId(source_p) ? "" : "~",
-				source_p->username,
-				show_ip(NULL, source_p) && !IsIPSpoof(source_p) ? source_p->sockhost : source_p->host);
+				source_p->username, source_p->host,
+				show_ip(NULL, source_p) && !IsIPSpoof(source_p) ? source_p->sockhost : "0");
 		ilog(L_FUSER, "Too many global connections from %s!%s%s@%s",
 			source_p->name, IsGotId(source_p) ? "" : "~",
 			source_p->username, source_p->sockhost);
@@ -229,10 +229,10 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
 
 	case TOO_MANY_IDENT:
 		sendto_realops_snomask(SNO_FULL, L_NETWIDE,
-				"Too many user connections for %s!%s%s@%s",
+				"Too many user connections for %s[%s%s@%s] [%s]",
 				source_p->name, IsGotId(source_p) ? "" : "~",
-				source_p->username,
-				show_ip(NULL, source_p) && !IsIPSpoof(source_p) ? source_p->sockhost : source_p->host);
+				source_p->username, source_p->host,
+				show_ip(NULL, source_p) && !IsIPSpoof(source_p) ? source_p->sockhost : "0");
 		ilog(L_FUSER, "Too many user connections from %s!%s%s@%s",
 			source_p->name, IsGotId(source_p) ? "" : "~",
 			source_p->username, source_p->sockhost);
@@ -243,10 +243,10 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern
 
 	case I_LINE_FULL:
 		sendto_realops_snomask(SNO_FULL, L_NETWIDE,
-				"I-line is full for %s!%s%s@%s (%s).",
+				"I-line is full for %s[%s%s@%s] [%s]",
 				source_p->name, IsGotId(source_p) ? "" : "~",
 				source_p->username, source_p->host,
-				show_ip(NULL, source_p) && !IsIPSpoof(source_p) ? source_p->sockhost : "255.255.255.255");
+				show_ip(NULL, source_p) && !IsIPSpoof(source_p) ? source_p->sockhost : "0");
 
 		ilog(L_FUSER, "Too many connections from %s!%s%s@%s.",
 			source_p->name, IsGotId(source_p) ? "" : "~",