diff --git a/functions/src/create-user.ts b/functions/src/create-user.ts
index dd2b5275..bc3a7cee 100644
--- a/functions/src/create-user.ts
+++ b/functions/src/create-user.ts
@@ -39,8 +39,7 @@ export const createUser = functions
     const name = cleanDisplayName(rawName)
     let username = cleanUsername(name)
 
-    const sameNameUser = await getUserByUsername(username)
-    if (sameNameUser) {
+    while (await getUserByUsername(username)) {
       username += randomString(4)
     }