diff --git a/web/src/pages/outposts/ServiceConnectionDockerForm.ts b/web/src/pages/outposts/ServiceConnectionDockerForm.ts
index 20ee94b880..15c4e82bca 100644
--- a/web/src/pages/outposts/ServiceConnectionDockerForm.ts
+++ b/web/src/pages/outposts/ServiceConnectionDockerForm.ts
@@ -98,7 +98,12 @@ export class ServiceConnectionDockerForm extends ModelForm<DockerServiceConnecti
                                     </option>`;
                                 });
                             }),
-                        html`<option>${t`Loading...`}</option>`,
+                        html`<option
+                            value=${ifDefined(this.instance?.tlsVerification || undefined)}
+                            ?selected=${this.instance?.tlsVerification !== undefined}
+                        >
+                            ${t`Loading...`}
+                        </option>`,
                     )}
                 </select>
                 <p class="pf-c-form__helper-text">
@@ -128,7 +133,12 @@ export class ServiceConnectionDockerForm extends ModelForm<DockerServiceConnecti
                                     </option>`;
                                 });
                             }),
-                        html`<option>${t`Loading...`}</option>`,
+                        html`<option
+                            value=${ifDefined(this.instance?.tlsAuthentication || undefined)}
+                            ?selected=${this.instance?.tlsAuthentication !== undefined}
+                        >
+                            ${t`Loading...`}
+                        </option>`,
                     )}
                 </select>
                 <p class="pf-c-form__helper-text">
diff --git a/web/src/pages/providers/ldap/LDAPProviderForm.ts b/web/src/pages/providers/ldap/LDAPProviderForm.ts
index 61e4f8d00f..934563ae12 100644
--- a/web/src/pages/providers/ldap/LDAPProviderForm.ts
+++ b/web/src/pages/providers/ldap/LDAPProviderForm.ts
@@ -193,7 +193,12 @@ export class LDAPProviderFormPage extends ModelForm<LDAPProvider, number> {
                                             </option>`;
                                         });
                                     }),
-                                html`<option>${t`Loading...`}</option>`,
+                                html`<option
+                                    value=${ifDefined(this.instance?.certificate || undefined)}
+                                    ?selected=${this.instance?.certificate !== undefined}
+                                >
+                                    ${t`Loading...`}
+                                </option>`,
                             )}
                         </select>
                         <p class="pf-c-form__helper-text">
diff --git a/web/src/pages/providers/oauth2/OAuth2ProviderForm.ts b/web/src/pages/providers/oauth2/OAuth2ProviderForm.ts
index 75e3215aaf..c00032e475 100644
--- a/web/src/pages/providers/oauth2/OAuth2ProviderForm.ts
+++ b/web/src/pages/providers/oauth2/OAuth2ProviderForm.ts
@@ -204,7 +204,12 @@ ${this.instance?.redirectUris}</textarea
                                             </option>`;
                                         });
                                     }),
-                                html`<option>${t`Loading...`}</option>`,
+                                html`<option
+                                    value=${ifDefined(this.instance?.signingKey || undefined)}
+                                    ?selected=${this.instance?.signingKey !== undefined}
+                                >
+                                    ${t`Loading...`}
+                                </option>`,
                             )}
                         </select>
                         <p class="pf-c-form__helper-text">${t`Key used to sign the tokens.`}</p>
diff --git a/web/src/pages/providers/proxy/ProxyProviderForm.ts b/web/src/pages/providers/proxy/ProxyProviderForm.ts
index b49b3f6ca8..6f6fcbe495 100644
--- a/web/src/pages/providers/proxy/ProxyProviderForm.ts
+++ b/web/src/pages/providers/proxy/ProxyProviderForm.ts
@@ -357,7 +357,12 @@ export class ProxyProviderFormPage extends ModelForm<ProxyProvider, number> {
                                             </option>`;
                                         });
                                     }),
-                                html`<option>${t`Loading...`}</option>`,
+                                html`<option
+                                    value=${ifDefined(this.instance?.certificate || undefined)}
+                                    ?selected=${this.instance?.certificate !== undefined}
+                                >
+                                    ${t`Loading...`}
+                                </option>`,
                             )}
                         </select>
                     </ak-form-element-horizontal>
diff --git a/web/src/pages/providers/saml/SAMLProviderForm.ts b/web/src/pages/providers/saml/SAMLProviderForm.ts
index e3571b229d..0dfc2d5f8d 100644
--- a/web/src/pages/providers/saml/SAMLProviderForm.ts
+++ b/web/src/pages/providers/saml/SAMLProviderForm.ts
@@ -169,7 +169,12 @@ export class SAMLProviderFormPage extends ModelForm<SAMLProvider, number> {
                                             </option>`;
                                         });
                                     }),
-                                html`<option>${t`Loading...`}</option>`,
+                                html`<option
+                                    value=${ifDefined(this.instance?.signingKp || undefined)}
+                                    ?selected=${this.instance?.signingKp !== undefined}
+                                >
+                                    ${t`Loading...`}
+                                </option>`,
                             )}
                         </select>
                         <p class="pf-c-form__helper-text">
@@ -203,7 +208,12 @@ export class SAMLProviderFormPage extends ModelForm<SAMLProvider, number> {
                                             </option>`;
                                         });
                                     }),
-                                html`<option>${t`Loading...`}</option>`,
+                                html`<option
+                                    value=${ifDefined(this.instance?.verificationKp || undefined)}
+                                    ?selected=${this.instance?.verificationKp !== undefined}
+                                >
+                                    ${t`Loading...`}
+                                </option>`,
                             )}
                         </select>
                         <p class="pf-c-form__helper-text">
diff --git a/web/src/pages/sources/ldap/LDAPSourceForm.ts b/web/src/pages/sources/ldap/LDAPSourceForm.ts
index 5353a1ff63..06b464a82f 100644
--- a/web/src/pages/sources/ldap/LDAPSourceForm.ts
+++ b/web/src/pages/sources/ldap/LDAPSourceForm.ts
@@ -173,7 +173,12 @@ export class LDAPSourceForm extends ModelForm<LDAPSource, string> {
                                             </option>`;
                                         });
                                     }),
-                                html`<option>${t`Loading...`}</option>`,
+                                html`<option
+                                    value=${ifDefined(this.instance?.peerCertificate || undefined)}
+                                    ?selected=${this.instance?.peerCertificate !== undefined}
+                                >
+                                    ${t`Loading...`}
+                                </option>`,
                             )}
                         </select>
                         <p class="pf-c-form__helper-text">
diff --git a/web/src/pages/sources/saml/SAMLSourceForm.ts b/web/src/pages/sources/saml/SAMLSourceForm.ts
index 2f528c6348..31f8a1e240 100644
--- a/web/src/pages/sources/saml/SAMLSourceForm.ts
+++ b/web/src/pages/sources/saml/SAMLSourceForm.ts
@@ -162,7 +162,12 @@ export class SAMLSourceForm extends ModelForm<SAMLSource, string> {
                                             </option>`;
                                         });
                                     }),
-                                html`<option>${t`Loading...`}</option>`,
+                                html`<option
+                                    value=${ifDefined(this.instance?.signingKp || undefined)}
+                                    ?selected=${this.instance?.signingKp !== undefined}
+                                >
+                                    ${t`Loading...`}
+                                </option>`,
                             )}
                         </select>
                         <p class="pf-c-form__helper-text">
diff --git a/web/src/pages/tenants/TenantForm.ts b/web/src/pages/tenants/TenantForm.ts
index c37bb9e96f..2a620fc583 100644
--- a/web/src/pages/tenants/TenantForm.ts
+++ b/web/src/pages/tenants/TenantForm.ts
@@ -378,7 +378,12 @@ export class TenantForm extends ModelForm<Tenant, string> {
                                             </option>`;
                                         });
                                     }),
-                                html`<option>${t`Loading...`}</option>`,
+                                html`<option
+                                    value=${ifDefined(this.instance?.webCertificate || undefined)}
+                                    ?selected=${this.instance?.webCertificate !== undefined}
+                                >
+                                    ${t`Loading...`}
+                                </option>`,
                             )}
                         </select>
                     </ak-form-element-horizontal>