diff --git a/src/components/DomainPicker.tsx b/src/components/DomainPicker.tsx
index afb273b5c..28bcd0029 100644
--- a/src/components/DomainPicker.tsx
+++ b/src/components/DomainPicker.tsx
@@ -163,15 +163,18 @@ export default function DomainPicker({
                         domainId: firstOrExistingDomain.domainId
                     };
 
+                    const base = firstOrExistingDomain.baseDomain;
+                    const sub =
+                        firstOrExistingDomain.type !== "cname"
+                            ? defaultSubdomain?.trim() || undefined
+                            : undefined;
+
                     onDomainChange?.({
                         domainId: firstOrExistingDomain.domainId,
                         type: "organization",
-                        subdomain:
-                            firstOrExistingDomain.type !== "cname"
-                                ? defaultSubdomain || undefined
-                                : undefined,
-                        fullDomain: firstOrExistingDomain.baseDomain,
-                        baseDomain: firstOrExistingDomain.baseDomain
+                        subdomain: sub,
+                        fullDomain: sub ? `${sub}.${base}` : base,
+                        baseDomain: base
                     });
                 }
             }
diff --git a/src/components/InternalResourceForm.tsx b/src/components/InternalResourceForm.tsx
index c6da0eb0e..f7254d6b7 100644
--- a/src/components/InternalResourceForm.tsx
+++ b/src/components/InternalResourceForm.tsx
@@ -495,7 +495,7 @@ export function InternalResourceForm({
                   alias: null,
                   httpHttpsPort: null,
                   scheme: "http",
-                  ssl: false,
+                  ssl: true,
                   httpConfigSubdomain: null,
                   httpConfigDomainId: null,
                   httpConfigFullDomain: null,
@@ -548,7 +548,7 @@ export function InternalResourceForm({
                 alias: null,
                 httpHttpsPort: null,
                 scheme: "http",
-                ssl: false,
+                ssl: true,
                 httpConfigSubdomain: null,
                 httpConfigDomainId: null,
                 httpConfigFullDomain: null,
@@ -732,7 +732,9 @@ export function InternalResourceForm({
                                         name="siteId"
                                         render={({ field }) => (
                                             <FormItem className="flex flex-col">
-                                                <FormLabel>{t("site")}</FormLabel>
+                                                <FormLabel>
+                                                    {t("site")}
+                                                </FormLabel>
                                                 <Popover>
                                                     <PopoverTrigger asChild>
                                                         <FormControl>
@@ -888,7 +890,10 @@ export function InternalResourceForm({
                                                     {t(destinationLabelKey)}
                                                 </FormLabel>
                                                 <FormControl>
-                                                    <Input {...field} className="w-full" />
+                                                    <Input
+                                                        {...field}
+                                                        className="w-full"
+                                                    />
                                                 </FormControl>
                                                 <FormMessage />
                                             </FormItem>
@@ -947,16 +952,16 @@ export function InternalResourceForm({
                                                                 const raw =
                                                                     e.target
                                                                         .value;
-                                                                if (raw === "") {
+                                                                if (
+                                                                    raw === ""
+                                                                ) {
                                                                     field.onChange(
                                                                         null
                                                                     );
                                                                     return;
                                                                 }
                                                                 const n =
-                                                                    Number(
-                                                                        raw
-                                                                    );
+                                                                    Number(raw);
                                                                 field.onChange(
                                                                     Number.isFinite(
                                                                         n
@@ -986,29 +991,6 @@ export function InternalResourceForm({
                                         {t(httpConfigurationDescriptionKey)}
                                     </div>
                                 </div>
-                                <FormField
-                                    control={form.control}
-                                    name="ssl"
-                                    render={({ field }) => (
-                                        <FormItem>
-                                            <FormControl>
-                                                <SwitchInput
-                                                    id="internal-resource-ssl"
-                                                    label={t(
-                                                        enableSslLabelKey
-                                                    )}
-                                                    description={t(
-                                                        enableSslDescriptionKey
-                                                    )}
-                                                    checked={!!field.value}
-                                                    onCheckedChange={
-                                                        field.onChange
-                                                    }
-                                                />
-                                            </FormControl>
-                                        </FormItem>
-                                    )}
-                                />
                                 <DomainPicker
                                     key={
                                         variant === "edit" && siteResourceId
@@ -1059,6 +1041,27 @@ export function InternalResourceForm({
                                         form.setValue("alias", res.fullDomain);
                                     }}
                                 />
+                                <FormField
+                                    control={form.control}
+                                    name="ssl"
+                                    render={({ field }) => (
+                                        <FormItem>
+                                            <FormControl>
+                                                <SwitchInput
+                                                    id="internal-resource-ssl"
+                                                    label={t(enableSslLabelKey)}
+                                                    description={t(
+                                                        enableSslDescriptionKey
+                                                    )}
+                                                    checked={!!field.value}
+                                                    onCheckedChange={
+                                                        field.onChange
+                                                    }
+                                                />
+                                            </FormControl>
+                                        </FormItem>
+                                    )}
+                                />
                             </div>
                         ) : (
                             <div className="space-y-4">