diff --git a/packages/network/samba/scripts/smbd-config b/packages/network/samba/scripts/smbd-config
index 6d143b773f..a3df4ddc85 100755
--- a/packages/network/samba/scripts/smbd-config
+++ b/packages/network/samba/scripts/smbd-config
@@ -70,10 +70,12 @@ if [ "$SAMBA_SECURE" == "true" -a ! "$SAMBA_USERNAME" == "" -a ! "$SAMBA_PASSWOR
   sed -e 's|^.[ \t]*.public.=.*|  public = no |' \
       -e 's|^.[ \t]*.username map.=.*||' \
       -e 's|^.[ \t]*.security.=.*|  security = user\n  username map = /run/samba/samba.map|' \
+      -e 's|^.[ \t]*.map.to.guest.=.*|  map to guest = Never|' \
       -i $SMB_CONF
 else
   sed -e 's|^.[ \t]*.public.=.*|  public = yes |' \
       -e 's|^.[ \t]*.username map.=.*||' \
       -e 's|^.[ \t]*.security.=.*|  security = user|' \
+      -e 's|^.[ \t]*.map.to.guest.=.*|  map to guest = Bad User|' \
       -i $SMB_CONF
 fi