diff --git a/charts/portainer/templates/deployment.yaml b/charts/portainer/templates/deployment.yaml
index 1081d82..1daa50a 100644
--- a/charts/portainer/templates/deployment.yaml
+++ b/charts/portainer/templates/deployment.yaml
@@ -37,9 +37,15 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           {{- end }}
-      {{- if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.edgeNodePort))) }}
-          args:  [ '--tunnel-port','{{ .Values.service.edgeNodePort }}' ]
-      {{- end }}          
+          args:
+          {{- if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.edgeNodePort))) }}
+            - '--tunnel-port'
+            - '{{ .Values.service.edgeNodePort }}'
+          {{- end }}          
+          {{- if (not (empty .Values.admin.password)) }}
+            - '--admin-password'
+            - '{{ .Values.admin.password }}'
+          {{- end }}          
           volumeMounts:
             - name: data
               mountPath: /data
diff --git a/charts/portainer/values.yaml b/charts/portainer/values.yaml
index 3313d99..2e2211f 100644
--- a/charts/portainer/values.yaml
+++ b/charts/portainer/values.yaml
@@ -4,6 +4,10 @@
 
 replicaCount: 1
 
+admin:
+  user: admin
+  password:
+
 # If enterpriseEdition is enabled, then use the values below _instead_ of those in .image
 enterpriseEdition: 
   enabled: false