diff --git a/src/app/[orgId]/settings/sites/[niceId]/general/page.tsx b/src/app/[orgId]/settings/sites/[niceId]/general/page.tsx
index 75406f48..50a1faff 100644
--- a/src/app/[orgId]/settings/sites/[niceId]/general/page.tsx
+++ b/src/app/[orgId]/settings/sites/[niceId]/general/page.tsx
@@ -15,7 +15,7 @@ import {
 import { Input } from "@/components/ui/input";
 import { useSiteContext } from "@app/hooks/useSiteContext";
 import { useForm } from "react-hook-form";
-import { toast } from "@app/hooks/useToast";
+import { toast, useToast } from "@app/hooks/useToast";
 import { useRouter } from "next/navigation";
 import {
     SettingsContainer,
@@ -37,6 +37,7 @@ import { Tag, TagInput } from "@app/components/tags/tag-input";
 
 const GeneralFormSchema = z.object({
     name: z.string().nonempty("Name is required"),
+    niceId: z.string().optional(),
     dockerSocketEnabled: z.boolean().optional(),
     remoteSubnets: z
         .array(
@@ -55,19 +56,18 @@ export default function GeneralPage() {
 
     const { env } = useEnvContext();
     const api = createApiClient(useEnvContext());
-
-    const [loading, setLoading] = useState(false);
-    const [activeCidrTagIndex, setActiveCidrTagIndex] = useState<number | null>(
-        null
-    );
-
     const router = useRouter();
     const t = useTranslations();
+    const { toast } = useToast();
+
+    const [loading, setLoading] = useState(false);
+    const [activeCidrTagIndex, setActiveCidrTagIndex] = useState<number | null>(null);
 
     const form = useForm({
         resolver: zodResolver(GeneralFormSchema),
         defaultValues: {
             name: site?.name,
+            niceId: site?.niceId || "",
             dockerSocketEnabled: site?.dockerSocketEnabled ?? false,
             remoteSubnets: site?.remoteSubnets
                 ? site.remoteSubnets.split(",").map((subnet, index) => ({
@@ -82,37 +82,40 @@ export default function GeneralPage() {
     async function onSubmit(data: GeneralFormValues) {
         setLoading(true);
 
-        await api
-            .post(`/site/${site?.siteId}`, {
+        try {
+            await api.post(`/site/${site?.siteId}`, {
                 name: data.name,
+                niceId: data.niceId,
                 dockerSocketEnabled: data.dockerSocketEnabled,
                 remoteSubnets:
                     data.remoteSubnets
-                        ?.map((subnet) => subnet.text)
-                        .join(",") || ""
-            })
-            .catch((e) => {
-                toast({
-                    variant: "destructive",
-                    title: t("siteErrorUpdate"),
-                    description: formatAxiosError(
-                        e,
-                        t("siteErrorUpdateDescription")
-                    )
-                });
+                    ?.map((subnet) => subnet.text)
+                    .join(",") || ""
             });
 
-        updateSite({
-            name: data.name,
-            dockerSocketEnabled: data.dockerSocketEnabled,
-            remoteSubnets:
-                data.remoteSubnets?.map((subnet) => subnet.text).join(",") || ""
-        });
+            updateSite({
+                name: data.name,
+                niceId: data.niceId,
+                dockerSocketEnabled: data.dockerSocketEnabled,
+                remoteSubnets:
+                    data.remoteSubnets?.map((subnet) => subnet.text).join(",") || ""
+            });
 
-        toast({
-            title: t("siteUpdated"),
-            description: t("siteUpdatedDescription")
-        });
+            if (data.niceId && data.niceId !== site?.niceId) {
+                router.replace(`/${site?.orgId}/settings/sites/${data.niceId}/general`);
+            }
+
+            toast({
+                title: t("siteUpdated"),
+                description: t("siteUpdatedDescription")
+            });
+        } catch (e) {
+            toast({
+                variant: "destructive",
+                title: t("siteErrorUpdate"),
+                description: formatAxiosError(e, t("siteErrorUpdateDescription"))
+            });
+        }
 
         setLoading(false);
 
@@ -153,8 +156,25 @@ export default function GeneralPage() {
                                     )}
                                 />
 
-                                {env.flags.enableClients &&
-                                site.type === "newt" ? (
+                                <FormField
+                                    control={form.control}
+                                    name="niceId"
+                                    render={({ field }) => (
+                                        <FormItem>
+                                            <FormLabel>{t("niceId") || "Nice ID"}</FormLabel>
+                                            <FormControl>
+                                                <Input
+                                                    {...field}
+                                                    placeholder="Enter Nice ID"
+                                                    className="flex-1"
+                                                />
+                                            </FormControl>
+                                            <FormMessage />
+                                        </FormItem>
+                                    )}
+                                />
+
+                                {env.flags.enableClients && site.type === "newt" ? (
                                     <FormField
                                         control={form.control}
                                         name="remoteSubnets"
diff --git a/src/components/SiteInfoCard.tsx b/src/components/SiteInfoCard.tsx
index 08519b22..35d7120c 100644
--- a/src/components/SiteInfoCard.tsx
+++ b/src/components/SiteInfoCard.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
-import { Check, InfoIcon, Pencil, X } from "lucide-react";
 import { useSiteContext } from "@app/hooks/useSiteContext";
 import {
     InfoSection,
@@ -11,12 +10,7 @@ import {
 } from "@app/components/InfoSection";
 import { useTranslations } from "next-intl";
 import { useEnvContext } from "@app/hooks/useEnvContext";
-import { Input } from "./ui/input";
-import { Button } from "./ui/button";
-import { useState } from "react";
-import { useToast } from "@app/hooks/useToast";
-import { createApiClient, formatAxiosError } from "@app/lib/api";
-import { useRouter, usePathname } from "next/navigation";
+
 
 type SiteInfoCardProps = {};
 
@@ -24,15 +18,6 @@ export default function SiteInfoCard({ }: SiteInfoCardProps) {
     const { site, updateSite } = useSiteContext();
     const t = useTranslations();
     const { env } = useEnvContext();
-    const api = createApiClient(useEnvContext());
-    const router = useRouter();
-    const pathname = usePathname();
-
-    const [isEditing, setIsEditing] = useState(false);
-    const [niceId, setNiceId] = useState(site.niceId);
-    const [tempNiceId, setTempNiceId] = useState(site.niceId);
-    const [isLoading, setIsLoading] = useState(false);
-    const { toast } = useToast();
 
     const getConnectionTypeString = (type: string) => {
         if (type === "newt") {
@@ -46,130 +31,11 @@ export default function SiteInfoCard({ }: SiteInfoCardProps) {
         }
     };
 
-    const handleEdit = () => {
-        setTempNiceId(niceId);
-        setIsEditing(true);
-    };
-
-    const handleCancel = () => {
-        setTempNiceId(niceId);
-        setIsEditing(false);
-    };
-
-    const handleSave = async () => {
-        if (tempNiceId.trim() === "") {
-            toast({
-                variant: "destructive",
-                title: t("error"),
-                description: t("niceIdCannotBeEmpty")
-            });
-            return;
-        }
-
-        if (tempNiceId === niceId) {
-            setIsEditing(false);
-            return;
-        }
-
-        setIsLoading(true);
-
-        try {
-            const response = await api.post(`/site/${site.siteId}`, {
-                niceId: tempNiceId.trim()
-            });
-
-            setNiceId(tempNiceId.trim());
-            setIsEditing(false);
-
-            updateSite({
-                niceId: tempNiceId.trim()
-            });
-
-            // update the URL to reflect the new niceId
-            const newPath = pathname.replace(`/sites/${niceId}`, `/sites/${tempNiceId.trim()}`);
-            router.replace(newPath);
-
-            toast({
-                title: t("niceIdUpdated"),
-                description: t("niceIdUpdatedSuccessfully")
-            });
-        } catch (e: any) {
-            toast({
-                variant: "destructive",
-                title: t("niceIdUpdateError"),
-                description: formatAxiosError(
-                    e,
-                    t("niceIdUpdateErrorDescription")
-                )
-            });
-        } finally {
-            setIsLoading(false);
-        }
-    };
-
-    const handleKeyDown = (e: React.KeyboardEvent) => {
-        if (e.key === "Enter") {
-            handleSave();
-        } else if (e.key === "Escape") {
-            handleCancel();
-        }
-    };
 
     return (
         <Alert>
             <AlertDescription>
-                <InfoSections cols={env.flags.enableClients ? 4 : 3}>
-                    <InfoSection>
-                        <InfoSectionTitle>
-                            {t("niceId")}
-                        </InfoSectionTitle>
-                        <InfoSectionContent>
-                            <div className="flex items-center gap-2">
-                                {isEditing ? (
-                                    <>
-                                        <Input
-                                            value={tempNiceId}
-                                            onChange={(e) => setTempNiceId(e.target.value)}
-                                            onKeyDown={handleKeyDown}
-                                            disabled={isLoading}
-                                            className="flex-1"
-                                            autoFocus
-                                        />
-                                        <Button
-                                            size="icon"
-                                            variant="ghost"
-                                            onClick={handleSave}
-                                            disabled={isLoading}
-                                            className="h-8 w-8"
-                                        >
-                                            <Check className="h-4 w-4" />
-                                        </Button>
-                                        <Button
-                                            size="icon"
-                                            variant="ghost"
-                                            onClick={handleCancel}
-                                            disabled={isLoading}
-                                            className="h-8 w-8"
-                                        >
-                                            <X className="h-4 w-4" />
-                                        </Button>
-                                    </>
-                                ) : (
-                                    <>
-                                        <span>{niceId}</span>
-                                        <Button
-                                            size="icon"
-                                            variant="ghost"
-                                            onClick={handleEdit}
-                                            className="h-8 w-8"
-                                        >
-                                            <Pencil className="h-4 w-4" />
-                                        </Button>
-                                    </>
-                                )}
-                            </div>
-                        </InfoSectionContent>
-                    </InfoSection>
+                <InfoSections cols={env.flags.enableClients ? 3 : 2}>
                     {(site.type == "newt" || site.type == "wireguard") && (
                         <>
                             <InfoSection>