--- src/modules/m_kick.c.orig	2006-06-16 14:29:16.000000000 -0400
+++ src/modules/m_kick.c	2006-08-02 18:45:00.378045147 -0400
@@ -175,7 +175,7 @@ CMD_FUNC(m_kick)
 					}
 				}
 
-				if (chptr->mode.mode & MODE_NOKICKS)
+				if (chptr->mode.mode & MODE_NOKICKS && MyClient(sptr))
 				{
 					if (!op_can_override(sptr))
 					{
@@ -202,20 +202,21 @@ CMD_FUNC(m_kick)
 					    ((sptr_flags & CHFL_HALFOP) && (who_flags & CHFL_ISOP)) ||
 					    ((sptr_flags & CHFL_HALFOP) && (who_flags & CHFL_HALFOP)))
 					{
-						sendto_snomask(SNO_EYES,
-						    "*** OperOverride -- %s (%s@%s) KICK %s %s (%s)",
-						    sptr->name, sptr->user->username, sptr->user->realhost,
-						    chptr->chname, who->name, comment);
-
-						/* Logging Implementation added by XeRXeS */
-						ircd_log(LOG_OVERRIDE,"OVERRIDE: %s (%s@%s) KICK %s %s (%s)",
+						if (stricmp(sptr->name, who->name)) {
+						    sendto_snomask(SNO_EYES,
+							"*** OperOverride -- %s (%s@%s) KICK %s %s (%s)",
 							sptr->name, sptr->user->username, sptr->user->realhost,
 							chptr->chname, who->name, comment);
 
+							/* Logging Implementation added by XeRXeS */
+						    ircd_log(LOG_OVERRIDE,"OVERRIDE: %s (%s@%s) KICK %s %s (%s)",
+						        sptr->name, sptr->user->username, sptr->user->realhost,
+							chptr->chname, who->name, comment);
+						}
 						goto attack;
 					}	/* is_chan_op */
 
-				}				
+				}
 				/* victim is +a or +q, we are not +q */
 				if ((who_flags & (CHFL_CHANOWNER|CHFL_CHANPROT) || IsServices(who))
 					 && !(sptr_flags & CHFL_CHANOWNER)) {