diff --git a/helmchart/single-sign-on/templates/cronjob-create-oauth-clients.yaml b/helmchart/single-sign-on/templates/cronjob-create-oauth-clients.yaml
index 7e120ec07c43be9820ae0bcb3f774b2309546d30..f3eb8f173cb55432967afb0ec6f6d734d2ae933a 100644
--- a/helmchart/single-sign-on/templates/cronjob-create-oauth-clients.yaml
+++ b/helmchart/single-sign-on/templates/cronjob-create-oauth-clients.yaml
@@ -51,11 +51,14 @@ spec:
             command: ["/bin/bash", "-c"]
             args:
             - >
+              curl http://{{ $.Release.Name }}-hydra-admin:4445/health/ready \
+                  --write-out "\nCheck Hydra health: HTTP %{http_code}" \
+                  | tail -1 | grep 200 && echo "Hydra is ready to accept requests." && \
               curl http://{{ $.Release.Name }}-hydra-admin:4445/clients/$CLIENT_NAME \
                   --silent \
-                  --write-out "\n%{http_code}\n"  \
+                  --write-out "\nRequesting oauth client $CLIENT_NAME: HTTP %{http_code}\n"  \
                   | tail -1  \
-                  | grep -v 200 &&
+                  | grep 404 &&
               curl --header "Content-Type: application/json" \
                   --request POST \
                   --data "{\"client_id\": \"$CLIENT_ID\",
@@ -70,7 +73,7 @@ spec:
                             \"token_endpoint_auth_method\": \"client_secret_post\"}" \
                   http://{{ $.Release.Name }}-hydra-admin:4445/clients \
                   --silent \
-                  --write-out "\n%Creating oauth client $CLIENT_ID: HTTP(%{http_code})\n" \
+                  --write-out "\nCreating oauth client $CLIENT_ID: HTTP(%{http_code})\n" \
                   | tail -1  \
                   | grep 201 &&
               echo "Successfully created $CLIENT_ID"