diff --git a/charts/traction/templates/ui/configmap.yaml b/charts/traction/templates/ui/configmap.yaml
index 53c2a6e8e..1544ebe78 100644
--- a/charts/traction/templates/ui/configmap.yaml
+++ b/charts/traction/templates/ui/configmap.yaml
@@ -25,6 +25,8 @@ data:
   SERVER_SMTP_PORT: {{ .Values.ui.smtp.port | quote }}
   SERVER_SMTP_SENDER_ADDRESS: {{ .Values.ui.smtp.senderAddress | quote }}
   SERVER_SMTP_SERVER: {{ .Values.ui.smtp.server | quote }}
+  SERVER_SMTP_SECURE: {{ .Values.ui.smtp.secure | quote }}
+  SERVER_SMTP_USER: {{ .Values.ui.smtp.user | quote }}
   SERVER_TRACTION_URL: http://{{ include "tenant_proxy.fullname" . }}:{{ .Values.tenant_proxy.service.port }}
   UX_APP_INNKEEPER_TITLE: {{ .Values.ui.ux.appInnkeeperTitle | quote }}
   UX_APP_TITLE: {{ .Values.ui.ux.appTitle | quote }}
diff --git a/charts/traction/templates/ui/deployment.yaml b/charts/traction/templates/ui/deployment.yaml
index 8a9252e2e..148374b20 100644
--- a/charts/traction/templates/ui/deployment.yaml
+++ b/charts/traction/templates/ui/deployment.yaml
@@ -70,6 +70,10 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ template "tenant-ui.fullname" . }}
+            {{- if .Values.ui.existingSecret }}
+            - secretRef:
+                name: {{ .Values.ui.existingSecret | quote }}
+            {{- end }}
           resources:
             {{- toYaml .Values.ui.resources | nindent 12 }}
           volumeMounts: