diff --git a/extensions/sasl_usercloak.c b/extensions/sasl_usercloak.c
index 26e4f52f..bce1c722 100644
--- a/extensions/sasl_usercloak.c
+++ b/extensions/sasl_usercloak.c
@@ -46,10 +46,12 @@ check_new_user(void *vdata)
 	if (EmptyString(source_p->user->suser))
 		return;
 
-	char *accountpart = strstr(source_p->orighost, "account");
-	if (!accountpart)
+	char *accountpart = strstr(source_p->orighost, "/account");
+	if (!accountpart || accountpart[8] != '\0')
 		return;
 
+	accountpart += 1;
+
 	char buf[HOSTLEN];
 	memset(buf, 0, sizeof(buf));
 	char *dst = buf;