diff --git a/operator/charts/patroni-core/templates/secrets/powa-secret.yaml b/operator/charts/patroni-core/templates/secrets/powa-secret.yaml
index 6742dcb3..1b425a48 100644
--- a/operator/charts/patroni-core/templates/secrets/powa-secret.yaml
+++ b/operator/charts/patroni-core/templates/secrets/powa-secret.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.patroni.powa.install }}
+{{- if (.Values.patroni.powa).install }}
 apiVersion: v1
 kind: Secret
 metadata:
diff --git a/operator/charts/patroni-services/templates/secrets/monitoring-secret.yaml b/operator/charts/patroni-services/templates/secrets/monitoring-secret.yaml
index 1a337097..8586fc9b 100644
--- a/operator/charts/patroni-services/templates/secrets/monitoring-secret.yaml
+++ b/operator/charts/patroni-services/templates/secrets/monitoring-secret.yaml
@@ -9,6 +9,6 @@ metadata:
   name: monitoring-credentials
 data:
   username: {{ "monitoring-user" | b64enc }}
-  password: {{ .Values.metricCollector.userPassword | b64enc }}
+  password: {{ required "there is empty userPassword field, fill it up!" .Values.metricCollector.userPassword | b64enc }}
 type: Opaque
 {{- end }}