diff --git a/apps-helm/samba4/conf/smb.conf b/apps-helm/samba4/conf/smb.conf
index 7c18ccf..01e3c22 100755
--- a/apps-helm/samba4/conf/smb.conf
+++ b/apps-helm/samba4/conf/smb.conf
@@ -3,6 +3,9 @@
     server string = {{ .Values.samba.global.server_string | default "%h server (Samba, Alpine)" }}
     security = {{ .Values.samba.global.security | default "user" }}
     map to guest = {{ .Values.samba.global.map_to_guest | default "Bad User" }}
+{{- if .Values.samba.global.include_echo_map_script }}
+    username map script = /bin/echo
+    {{ end -}}
     encrypt passwords = {{ .Values.samba.global.encrypt_passwords | default "yes" }}
     load printers = no
     printing = bsd
diff --git a/apps-helm/samba4/values.yaml b/apps-helm/samba4/values.yaml
index a2e1080..d96b256 100644
--- a/apps-helm/samba4/values.yaml
+++ b/apps-helm/samba4/values.yaml
@@ -26,6 +26,7 @@ podSecurityContext:
 samba:
   global:
     workgroup: WORKGROUP
+    include_echo_map_script: true
   share: {}
   users: []