diff --git a/server/db/names.ts b/server/db/names.ts
index d4fe6bb..f5e253b 100644
--- a/server/db/names.ts
+++ b/server/db/names.ts
@@ -21,7 +21,7 @@ export async function getUniqueName(orgId: string): Promise<string> {
         }
 
         const name = generateName();
-        const count = await db.select({niceId: sites.niceId, orgId: sites.orgId}).from(sites).where(and(eq(sites.niceId, name), eq(sites.orgId, orgId)));
+        const count = await db.select({ niceId: sites.niceId, orgId: sites.orgId }).from(sites).where(and(eq(sites.niceId, name), eq(sites.orgId, orgId)));
         if (count.length === 0) {
             return name;
         }
diff --git a/server/routers/site/createSite.ts b/server/routers/site/createSite.ts
index d8ae898..a679b38 100644
--- a/server/routers/site/createSite.ts
+++ b/server/routers/site/createSite.ts
@@ -73,7 +73,7 @@ export async function createSite(req: Request, res: Response, next: NextFunction
             return next(createHttpError(HttpCode.FORBIDDEN, 'User does not have a role'));
         }
 
-        const niceId = getUniqueName();
+        const niceId = await getUniqueName(orgId);
 
         // TODO: pick a subnet