diff --git a/charts/nautobot/templates/_helpers.tpl b/charts/nautobot/templates/_helpers.tpl
index 2c53fbcd..38292b1e 100644
--- a/charts/nautobot/templates/_helpers.tpl
+++ b/charts/nautobot/templates/_helpers.tpl
@@ -192,7 +192,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
     {{- .Values.nautobot.db.existingSecretPasswordKey -}}
   {{- else if eq .Values.postgresql.enabled true -}}
     {{- if .Values.postgresql.auth.existingSecret -}}
-      {{- default "password" .Values.postgresql.auth.secretsKeys.adminPasswordKey -}}
+      {{- default "password" .Values.postgresql.auth.secretKeys.userPasswordKey -}}
     {{- else -}}
       {{- printf "password" -}}
     {{- end -}}
diff --git a/charts/nautobot/templates/secret.yaml b/charts/nautobot/templates/secret.yaml
index e674483f..51ed3f47 100644
--- a/charts/nautobot/templates/secret.yaml
+++ b/charts/nautobot/templates/secret.yaml
@@ -16,7 +16,7 @@ type: Opaque
 data:
 {{- include "nautobot.secret.env" . | nindent 2 }}
 
-{{- if not .Values.nautobot.db.existingSecret }}
+{{- if not ( or .Values.nautobot.db.existingSecret .Values.postgresql.auth.existingSecret .Values.mariadb.auth.existingSecret ) }}
 ---
 apiVersion: v1
 kind: Secret