diff --git a/src/ngircd/client.c b/src/ngircd/client.c
index 1c7bd1ea..67c02604 100644
--- a/src/ngircd/client.c
+++ b/src/ngircd/client.c
@@ -339,9 +339,9 @@ Client_SetHostname( CLIENT *Client, const char *Hostname )
 
 	/* Only cloak the hostmask if it has not yet been cloaked.
 	 * The period or colon indicates it's still an IP address.
-	 * An empty string means a rDNS lookup did not happen (yet).
-         */
-	if (Conf_CloakHost[0] && (!Client->host[0] || strpbrk(Client->host, ".:"))) {
+	 * An empty string means a rDNS lookup did not happen (yet). */
+	if (Conf_CloakHost[0] && (!Client->host[0] || strchr(Client->host, '.')
+				  || strchr(Client->host, ':'))) {
 		char cloak[GETID_LEN];
 
 		strlcpy(cloak, Hostname, GETID_LEN);