diff --git a/charts/vaultwarden/Chart.yaml b/charts/vaultwarden/Chart.yaml
index 4aa7a0a..d8d8171 100644
--- a/charts/vaultwarden/Chart.yaml
+++ b/charts/vaultwarden/Chart.yaml
@@ -12,4 +12,4 @@ maintainers:
   - name: Lester Guerzon
     email: guerzon@proton.me
     url: https://github.com/guerzon
-version: 0.14.0
+version: 0.14.1
diff --git a/charts/vaultwarden/templates/configmap.yaml b/charts/vaultwarden/templates/configmap.yaml
index c82988a..69200cf 100644
--- a/charts/vaultwarden/templates/configmap.yaml
+++ b/charts/vaultwarden/templates/configmap.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: vaultwarden
     {{- include "vaultwarden.labels" . | nindent 4 }}
 data:
-  DOMAIN: {{ .Values.domain | quote }}
+  DOMAIN: {{ required "A valid .Values.domain entry required. Variable needs to contain the protocol (http, https). Use 'http[s]://bw.example.com' instead of 'bw.example.com'" .Values.domain | quote }}
   {{- if and .Values.smtp.host .Values.smtp.from | quote }}
   SMTP_HOST: {{ .Values.smtp.host | quote }}
   SMTP_SECURITY: {{ .Values.smtp.security | quote }}
diff --git a/charts/vaultwarden/templates/statefulset.yaml b/charts/vaultwarden/templates/statefulset.yaml
index d9357e2..58911c7 100644
--- a/charts/vaultwarden/templates/statefulset.yaml
+++ b/charts/vaultwarden/templates/statefulset.yaml
@@ -73,7 +73,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: {{ default (include "vaultwarden.fullname" .) .Values.adminToken.existingSecret }}
-                  key: {{ default "ADMIN_TOKEN" .Values.adminToken.existingSecretKey }}
+                  key: {{ .Values.adminToken.existingSecretKey }}
             {{- if ne "default" .Values.database.type }}
             - name: DATABASE_URL
               {{- if .Values.database.existingSecret }}
diff --git a/charts/vaultwarden/values.yaml b/charts/vaultwarden/values.yaml
index 1f080c8..81a7517 100644
--- a/charts/vaultwarden/values.yaml
+++ b/charts/vaultwarden/values.yaml
@@ -65,9 +65,8 @@ adminToken:
   ## @param adminToken.existingSecretKey When using adminToken.existingSecret, specify the key containing the token.
   ## Example: ADMIN_TOKEN
   ##
-  existingSecretKey: ""
+  existingSecretKey: "ADMIN_TOKEN"
   ## @param adminToken.value Plain string containing the admin token.
-  ## Example: ADMIN_TOKEN
   ##
   value: "R@ndomToken$tring"
 ## @param signupsAllowed By default, anyone who can access your instance can register for a new account.
diff --git a/demo.yaml b/demo.yaml
index 41bd885..7ea9111 100644
--- a/demo.yaml
+++ b/demo.yaml
@@ -10,7 +10,9 @@ ingress:
     alb.ingress.kubernetes.io/tags: Environment=dev,Team=test
     alb.ingress.kubernetes.io/certificate-arn: "arn:aws:acm:eu-central-1:ACCOUNT:certificate/LONGID"
 
-adminToken: "khit9gYQV6ax9LKTTm+s6QbZi5oiuR+3s1PEn9q3IRmCl9IQn7LmBpmFCOYTb7Mr"
+smtp:
+  host: "smtp.contoso.com"
+  from: "vaultwarden@contoso.com"
 
 image:
   pullSecrets: