diff --git a/packages/frontend/src/components/shared/Select/Select.tsx b/packages/frontend/src/components/shared/Select/Select.tsx
index f9b15300..c84a44a3 100644
--- a/packages/frontend/src/components/shared/Select/Select.tsx
+++ b/packages/frontend/src/components/shared/Select/Select.tsx
@@ -219,6 +219,7 @@ export const Select = ({
     getItemProps,
     openMenu,
   } = useCombobox({
+    defaultInputValue: (options[0] as unknown as SelectOption)?.value,
     items: filteredItems,
     selectedItem: multiple ? null : (value as SelectOption) || null,
     // @ts-expect-error – there are two params but we don't need the second one
diff --git a/packages/frontend/src/pages/org-slug/projects/create/template/index.tsx b/packages/frontend/src/pages/org-slug/projects/create/template/index.tsx
index 0988af7a..a0a7f0c0 100644
--- a/packages/frontend/src/pages/org-slug/projects/create/template/index.tsx
+++ b/packages/frontend/src/pages/org-slug/projects/create/template/index.tsx
@@ -151,24 +151,29 @@ const CreateRepo = () => {
             The project will be cloned into this repository
           </Heading>
         </div>
+
         <div className="flex flex-col justify-start gap-3">
           <span className="text-sm text-elements-high-em">Git account</span>
-          <Controller
-            name="account"
-            control={control}
-            render={({ field: { value, onChange } }) => (
-              <Select
-                value={{ value } as SelectOption}
-                onChange={(value) => onChange((value as SelectOption).value)}
-                options={
-                  gitAccounts.map((account) => ({
-                    value: account,
-                    label: account,
-                  })) ?? []
-                }
-              />
-            )}
-          />
+          {gitAccounts.length > 0 ? (
+            <Controller
+              name="account"
+              control={control}
+              render={({ field: { value, onChange } }) => (
+                <Select
+                  value={{ value } as SelectOption}
+                  onChange={(value) => onChange((value as SelectOption).value)}
+                  options={
+                    gitAccounts.map((account) => ({
+                      value: account,
+                      label: account,
+                    })) ?? []
+                  }
+                />
+              )}
+            />
+          ) : (
+            <Select options={[]} disabled />
+          )}
         </div>
         <div className="flex flex-col justify-start gap-3">
           <span className="text-sm text-elements-high-em">Name the repo</span>