diff --git a/stable/mongodb/Chart.yaml b/stable/mongodb/Chart.yaml
index fe0e8040cb..987bb10497 100644
--- a/stable/mongodb/Chart.yaml
+++ b/stable/mongodb/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: mongodb
-version: 5.16.3
+version: 5.16.4
 appVersion: 4.0.9
 description: NoSQL document-oriented database that stores JSON-like documents with dynamic schemas, simplifying the integration of data in content-driven applications.
 keywords:
diff --git a/stable/mongodb/templates/deployment-standalone.yaml b/stable/mongodb/templates/deployment-standalone.yaml
index 8db8cf6f13..b505caef86 100644
--- a/stable/mongodb/templates/deployment-standalone.yaml
+++ b/stable/mongodb/templates/deployment-standalone.yaml
@@ -71,6 +71,13 @@ spec:
           value: "1"
         {{- end }}
         {{- if .Values.usePassword }}
+        {{- if and .Values.mongodbUsername .Values.mongodbDatabase }}
+        - name: MONGODB_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: {{ if .Values.existingSecret }}{{ .Values.existingSecret }}{{- else }}{{ template "mongodb.fullname" . }}{{- end }}
+              key: mongodb-password
+        {{- end }}
         - name: MONGODB_ROOT_PASSWORD
           valueFrom:
             secretKeyRef:
@@ -81,13 +88,6 @@ spec:
         - name: MONGODB_USERNAME
           value: {{ .Values.mongodbUsername | quote }}
         {{- end }}
-        {{- if and .Values.mongodbUsername .Values.mongodbDatabase }}
-        - name: MONGODB_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ if .Values.existingSecret }}{{ .Values.existingSecret }}{{- else }}{{ template "mongodb.fullname" . }}{{- end }}
-              key: mongodb-password
-        {{- end }}
         - name: MONGODB_SYSTEM_LOG_VERBOSITY
           value: {{ .Values.mongodbSystemLogVerbosity | quote }}
         - name: MONGODB_DISABLE_SYSTEM_LOG
diff --git a/stable/mongodb/templates/secrets.yaml b/stable/mongodb/templates/secrets.yaml
index ecbf1eb094..bf644cba9e 100644
--- a/stable/mongodb/templates/secrets.yaml
+++ b/stable/mongodb/templates/secrets.yaml
@@ -10,13 +10,11 @@ metadata:
     heritage: "{{ .Release.Service }}"
 type: Opaque
 data:
-  {{- if .Values.usePassword }}
   {{- if .Values.mongodbRootPassword }}
   mongodb-root-password:  {{ .Values.mongodbRootPassword | b64enc | quote }}
   {{- else }}
   mongodb-root-password: {{ randAlphaNum 10 | b64enc | quote }}
   {{- end }}
-  {{- end }}
   {{- if and .Values.mongodbUsername .Values.mongodbDatabase }}
   {{- if .Values.mongodbPassword }}
   mongodb-password:  {{ .Values.mongodbPassword | b64enc | quote }}
diff --git a/stable/mongodb/templates/statefulset-primary-rs.yaml b/stable/mongodb/templates/statefulset-primary-rs.yaml
index dbd74fa184..57fb792930 100644
--- a/stable/mongodb/templates/statefulset-primary-rs.yaml
+++ b/stable/mongodb/templates/statefulset-primary-rs.yaml
@@ -111,7 +111,7 @@ spec:
             value: {{ .Values.mongodbDatabase | quote }}
           {{- end }}
             {{- if .Values.usePassword }}
-            {{- if and .Values.mongodbUsername (or .Values.mongodbPassword .Values.existingSecret) }}
+            {{- if and .Values.mongodbUsername .Values.mongodbDatabase }}
           - name: MONGODB_PASSWORD
             valueFrom:
               secretKeyRef: