diff --git a/Xext/security.c b/Xext/security.c
index 54a2b3e3f..2a73b6066 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -1122,8 +1122,10 @@ CALLBACK(SecurityClientStateCallback)
     switch (client->clientState)
     {
     case ClientStateInitial:
-	TRUSTLEVEL(serverClient) = XSecurityClientTrusted;
-	AUTHID(serverClient) = None;
+	if (client == serverClient) {
+	    TRUSTLEVEL(serverClient) = XSecurityClientTrusted;
+	    AUTHID(serverClient) = None;
+	}
 	break;
 
 	case ClientStateRunning: