diff --git a/flux2/core/base/single-sign-on/release.yaml b/flux2/core/base/single-sign-on/release.yaml
index 02aefb7bf86fb14079fa560aecf22a64d30ab1db..7f240d648da115909bfba8978f287c03e2ac847c 100644
--- a/flux2/core/base/single-sign-on/release.yaml
+++ b/flux2/core/base/single-sign-on/release.yaml
@@ -17,9 +17,7 @@ spec:
         namespace: flux-system
   interval: 1h0m0s
   install:
-    remediation:
-      retries: 3
-    timeout: 10m
+    timeout: 20m
   upgrade:
     crds: CreateReplace
   valuesFrom:
diff --git a/flux2/core/base/single-sign-on/single-sign-on-values-configmap.yaml b/flux2/core/base/single-sign-on/single-sign-on-values-configmap.yaml
index cfa0d5974454143d1d97f9cd7055664cc3502cd9..5f1c178a455728960780af0d0c91fa641a03c763 100644
--- a/flux2/core/base/single-sign-on/single-sign-on-values-configmap.yaml
+++ b/flux2/core/base/single-sign-on/single-sign-on-values-configmap.yaml
@@ -7,6 +7,12 @@ data:
   values.yaml: |
     singleSignOnHost: &SSO_HOST "sso.${domain}"
 
+    login:
+      user: ${admin_email}
+      password: ${userbackend_admin_password}
+      db:
+        password: ${userbackend_postgres_password}
+
     postgresql:
       persistence:
         existingClaim: single-sign-on-database
diff --git a/install/templates/stackspin-single-sign-on-variables.yaml.jinja b/install/templates/stackspin-single-sign-on-variables.yaml.jinja
index 70caab6571ab5622d5d681b67baa39696db28e83..31502141f88b0966a2efa4ec4aef6cfb0dec2cc1 100644
--- a/install/templates/stackspin-single-sign-on-variables.yaml.jinja
+++ b/install/templates/stackspin-single-sign-on-variables.yaml.jinja
@@ -4,7 +4,6 @@ kind: Secret
 metadata:
   name: stackspin-single-sign-on-variables
 data:
-  userbackend_admin_username: '{{ "admin" | b64encode }}'
   userbackend_admin_password: "{{ 32 | generate_password | b64encode }}"
   userbackend_postgres_password: "{{ 32 | generate_password | b64encode }}"
   hydra_system_secret: "{{ 32 | generate_password | b64encode }}"