diff --git a/bin/migrator/src/migrate.rs b/bin/migrator/src/migrate.rs
index db188f723..3d06fbc2e 100644
--- a/bin/migrator/src/migrate.rs
+++ b/bin/migrator/src/migrate.rs
@@ -129,6 +129,7 @@ pub async fn migrate_builds(
   Ok(())
 }
 
+#[allow(unused)]
 pub async fn migrate_updates(
   legacy_db: &v0::DbClient,
   target_db: &crate::DbClient,
diff --git a/frontend/src/components/resources/build/config.tsx b/frontend/src/components/resources/build/config.tsx
index a9f428b59..b1b7817e3 100644
--- a/frontend/src/components/resources/build/config.tsx
+++ b/frontend/src/components/resources/build/config.tsx
@@ -116,17 +116,19 @@ export const BuildConfig = ({
               repo: { placeholder: "Enter repo" },
               branch: { placeholder: "Enter branch" },
               commit: { placeholder: "Enter specific commit hash. Optional." },
-              github_account: (account, set) => (
-                <AccountSelector
-                  id={update.builder_id ?? config.builder_id ?? undefined}
-                  type="Builder"
-                  account_type="github"
-                  selected={account}
-                  onSelect={(github_account) => set({ github_account })}
-                  disabled={disabled}
-                  placeholder="None"
-                />
-              ),
+              github_account:
+                (update.builder_id ?? config.builder_id ? true : false) &&
+                ((account, set) => (
+                  <AccountSelector
+                    id={update.builder_id ?? config.builder_id ?? undefined}
+                    type="Builder"
+                    account_type="github"
+                    selected={account}
+                    onSelect={(github_account) => set({ github_account })}
+                    disabled={disabled}
+                    placeholder="None"
+                  />
+                )),
             },
           },
           {
@@ -134,17 +136,18 @@ export const BuildConfig = ({
             components: {
               build_path: true,
               dockerfile_path: true,
-              docker_account: (account, set) => (
-                <AccountSelector
-                  id={update.builder_id ?? config.builder_id ?? undefined}
-                  type="Builder"
-                  account_type="docker"
-                  selected={account}
-                  onSelect={(docker_account) => set({ docker_account })}
-                  disabled={disabled}
-                  placeholder="None"
-                />
-              ),
+              docker_account: (account, set) =>
+                (update.builder_id ?? config.builder_id ? true : false) && (
+                  <AccountSelector
+                    id={update.builder_id ?? config.builder_id ?? undefined}
+                    type="Builder"
+                    account_type="docker"
+                    selected={account}
+                    onSelect={(docker_account) => set({ docker_account })}
+                    disabled={disabled}
+                    placeholder="None"
+                  />
+                ),
               docker_organization:
                 docker_organizations === undefined ||
                 docker_organizations.length === 0
@@ -298,7 +301,9 @@ const DockerOrganizations = ({
     <ConfigItem label="Docker Organization">
       <Select
         value={value}
-        onValueChange={(value) => set({ docker_organization: value })}
+        onValueChange={(value) =>
+          set({ docker_organization: value === "Empty" ? "" : value })
+        }
         disabled={disabled}
       >
         <SelectTrigger
@@ -308,7 +313,7 @@ const DockerOrganizations = ({
           <SelectValue placeholder="Select Organization" />
         </SelectTrigger>
         <SelectContent>
-          <SelectItem value={""}>None</SelectItem>
+          <SelectItem value={"Empty"}>None</SelectItem>
           {docker_organizations?.map((org) => (
             <SelectItem key={org} value={org}>
               {org}
diff --git a/frontend/src/components/resources/common.tsx b/frontend/src/components/resources/common.tsx
index 7a17832f6..8d42e96e1 100644
--- a/frontend/src/components/resources/common.tsx
+++ b/frontend/src/components/resources/common.tsx
@@ -117,7 +117,7 @@ export const ResourceSelector = ({
             onValueChange={setInput}
           />
           <CommandList>
-            <CommandEmpty className="flex justify-evenly items-center">
+            <CommandEmpty className="flex justify-evenly items-center pt-2">
               {`No ${type}s Found`}
               <SearchX className="w-3 h-3" />
             </CommandEmpty>