diff --git a/helmchart/single-sign-on/templates/job-create-admin.yaml b/helmchart/single-sign-on/templates/job-create-admin.yaml
index 981a92fc424b8e44aa17f9b8e23abc04a3fc4e97..cdf1575070eefe08dd717b84691be68e96cd0d75 100644
--- a/helmchart/single-sign-on/templates/job-create-admin.yaml
+++ b/helmchart/single-sign-on/templates/job-create-admin.yaml
@@ -7,7 +7,7 @@ metadata:
   annotations:
     "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-weight": "-5"
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+    "helm.sh/hook-delete-policy": before-hook-creation
 spec:
   template:
     metadata:
@@ -38,6 +38,6 @@ spec:
           value: config.DevelopmentConfig
         command: ["/bin/bash", "-c"]
         args:
-          flask user create "mart@greenhost.nl"
-          flask user setpassword "mart@greenhost.nl" "aaaaaaaaaap"
+          - flask user create mart@greenhost.nl;
+            flask user setpassword mart@greenhost.nl aaaaaaaaaaaaaaap ;
 
diff --git a/helmchart/single-sign-on/values.yaml b/helmchart/single-sign-on/values.yaml
index 96092392d0e70189afa78f1e2c1674fadb4b39bc..17acf4166b1f180dc6df0cb3eea987439ed39694 100644
--- a/helmchart/single-sign-on/values.yaml
+++ b/helmchart/single-sign-on/values.yaml
@@ -200,7 +200,7 @@ hydra:
 # Install login panel
 login:
   image:
-    << : &IMAGE_DEFAULTS_SSO { tag: "104-allow-cli-to-set-password-create-inital-admin-user", pullPolicy: "Always" }
+    << : &IMAGE_DEFAULTS_SSO { tag: "108-embed-login-panel-in-helmchart", pullPolicy: "Always" }
 #    << : &IMAGE_DEFAULTS_SSO { tag: "master", pullPolicy: "Always" }
     repository: "open.greenhost.net:4567/stackspin/single-sign-on/login"
   podAnnotations: {}