diff --git a/framework/PageForm/Inputs/PageFormSelect.tsx b/framework/PageForm/Inputs/PageFormSelect.tsx
index debc1a8b2b..ce6435dcca 100644
--- a/framework/PageForm/Inputs/PageFormSelect.tsx
+++ b/framework/PageForm/Inputs/PageFormSelect.tsx
@@ -93,6 +93,8 @@ export type PageFormSelectProps<
   validate?:
     | Validate<FieldPathValue<TFieldValues, TFieldName>, TFieldValues>
     | Record<string, Validate<FieldPathValue<TFieldValues, TFieldName>, TFieldValues>>;
+
+  defaultValue?: FieldPathValue<TFieldValues, TFieldName>;
 };
 
 export function PageFormSelect<
@@ -205,7 +207,7 @@ export function PageFormSelect<
                   <SelectOption
                     id={optionId}
                     key={option.label}
-                    value={option.label}
+                    value={option.label || props.defaultValue}
                     label={option.label}
                     description={option.description}
                     data-cy={optionId}
diff --git a/framework/PageForm/Inputs/PageFormSingleSelect.tsx b/framework/PageForm/Inputs/PageFormSingleSelect.tsx
index d7ce1b9ff0..d1335f4e46 100644
--- a/framework/PageForm/Inputs/PageFormSingleSelect.tsx
+++ b/framework/PageForm/Inputs/PageFormSingleSelect.tsx
@@ -23,6 +23,7 @@ export type PageFormSingleSelectProps<
     | Validate<FieldPathValue<TFieldValues, TFieldName>, TFieldValues>
     | Record<string, Validate<FieldPathValue<TFieldValues, TFieldName>, TFieldValues>>;
   isReadOnly?: boolean;
+  defaultValue?: FieldPathValue<TFieldValues, TFieldName>;
 } & Pick<
   PageSingleSelectProps<ValueT>,
   'id' | 'placeholder' | 'options' | 'footer' | 'isDisabled' | 'isRequired' | 'disableSortOptions'
@@ -79,7 +80,7 @@ export function PageFormSingleSelect<
               placeholder={props.placeholder}
               options={props.options}
               aria-describedby={id ? `${id}-form-group` : undefined}
-              value={value}
+              value={value || props.defaultValue}
               onSelect={onChange}
               isDisabled={isDisabled}
               footer={props.footer}
diff --git a/frontend/awx/access/credentials/CredentialForm.tsx b/frontend/awx/access/credentials/CredentialForm.tsx
index c722a3747d..728dc378c7 100644
--- a/frontend/awx/access/credentials/CredentialForm.tsx
+++ b/frontend/awx/access/credentials/CredentialForm.tsx
@@ -40,6 +40,10 @@ interface CredentialForm extends Credential {
   user?: number;
 }
 
+interface CredentialSelectProps extends CredentialInputField {
+  name: string;
+}
+
 interface initialValues {
   name: string;
   description: string;
@@ -430,10 +434,10 @@ function CredentialSubForm({
         })}
       {choiceFields.length > 0 &&
         choiceFields.map((field) => (
-          <PageFormSelect<CredentialType>
+          <PageFormSelect<CredentialSelectProps>
             key={field.id}
-            placeholderText={String(field?.default)}
-            name={field.id as keyof CredentialType}
+            defaultValue={field?.default}
+            name={field?.id as keyof CredentialSelectProps}
             label={field.label}
             options={field?.choices?.map((choice) => ({ value: choice, label: choice })) ?? []}
             isRequired={requiredFields.includes(field.id)}
diff --git a/frontend/awx/access/credentials/CredentialPlugins/CredentialPlugins.tsx b/frontend/awx/access/credentials/CredentialPlugins/CredentialPlugins.tsx
index fd18abae43..fdc53a7f23 100644
--- a/frontend/awx/access/credentials/CredentialPlugins/CredentialPlugins.tsx
+++ b/frontend/awx/access/credentials/CredentialPlugins/CredentialPlugins.tsx
@@ -53,6 +53,7 @@ export function CredentialPlugins({
           if ('choices' in input) {
             return (
               <PageFormSingleSelect
+                defaultValue={input?.default}
                 name={input.id}
                 key={input.id}
                 label={input.label}
diff --git a/frontend/awx/interfaces/CredentialType.ts b/frontend/awx/interfaces/CredentialType.ts
index a782f6c5da..6be0a0ff4c 100644
--- a/frontend/awx/interfaces/CredentialType.ts
+++ b/frontend/awx/interfaces/CredentialType.ts
@@ -42,6 +42,7 @@ export interface CredentialType
       help_text: string;
       choices?: string[];
       multiline?: boolean;
+      default?: boolean | string;
     }[];
   };
   related: {