diff --git a/src/app/[orgId]/sites/[niceId]/components/create-site.tsx b/src/app/[orgId]/sites/[niceId]/components/create-site.tsx
index 1faf351..936506e 100644
--- a/src/app/[orgId]/sites/[niceId]/components/create-site.tsx
+++ b/src/app/[orgId]/sites/[niceId]/components/create-site.tsx
@@ -45,7 +45,7 @@ const accountFormSchema = z.object({
 type AccountFormValues = z.infer<typeof accountFormSchema>;
 
 const defaultValues: Partial<AccountFormValues> = {
-    name: "Wombat",
+    name: "",
     method: "wg"
 };
 
diff --git a/src/components/sidebar-nav.tsx b/src/components/sidebar-nav.tsx
index 3b6a82e..eee5cf6 100644
--- a/src/components/sidebar-nav.tsx
+++ b/src/components/sidebar-nav.tsx
@@ -35,7 +35,7 @@ export function SidebarNav({ className, items, disabled = false, ...props }: Sid
                     href={item.href.replace("{orgId}", orgId).replace("{niceId}", niceId).replace("{resourceId}", resourceId)}
                     className={cn(
                         buttonVariants({ variant: "ghost" }),
-                        pathname === item.href.replace("{orgId}", orgId).replace("{niceId}", niceId).replace("{resourceId}", resourceId)
+                        pathname === item.href.replace("{orgId}", orgId).replace("{niceId}", niceId).replace("{resourceId}", resourceId) && !pathname.includes("create")
                             ? "bg-muted hover:bg-muted"
                             : "hover:bg-transparent hover:underline",
                         "justify-start",