diff --git a/helmchart/single-sign-on/templates/job-create-admin-user.yaml b/helmchart/single-sign-on/templates/job-create-admin-user.yaml
index 262f82d61bf893611609b563490077fa1e8ff692..7c734969bcc2b6d45219f690de84090bc2a9c149 100644
--- a/helmchart/single-sign-on/templates/job-create-admin-user.yaml
+++ b/helmchart/single-sign-on/templates/job-create-admin-user.yaml
@@ -31,7 +31,9 @@ spec:
         command: ["/bin/bash", "-c"]
         args:
         - /bin/bash ./utils/create-user.bash "$USERNAME" "$PASSWORD" "$EMAIL" {{ include "single-sign-on.fullname" . }}-userbackend 80 &&
+          {{- range .Values.oAuthClients }}
+          /bin/bash ./utils/create-application.bash {{ .clientName }} {{ include "single-sign-on.fullname" $ }}-userbackend 80 &&
+          /bin/bash ./utils/grant-access.bash "$USERNAME" {{ .clientName }} {{ include "single-sign-on.fullname" $ }}-userbackend 80 &&
+          {{- end }}
           /bin/bash ./utils/create-role.bash admin {{ include "single-sign-on.fullname" . }}-userbackend 80 &&
-          /bin/bash ./utils/create-application.bash user-panel {{ include "single-sign-on.fullname" . }}-userbackend 80 &&
-          /bin/bash ./utils/assign-role.bash "$USERNAME" admin {{ include "single-sign-on.fullname" . }}-userbackend 80 &&
-          /bin/bash ./utils/grant-access.bash "$USERNAME" user-panel {{ include "single-sign-on.fullname" . }}-userbackend 80
+          /bin/bash ./utils/assign-role.bash "$USERNAME" admin {{ include "single-sign-on.fullname" . }}-userbackend 80