diff --git a/06_Copy2Media.cmd b/06_Copy2Media.cmd
index 16e8d9d..bce5f92 100644
--- a/06_Copy2Media.cmd
+++ b/06_Copy2Media.cmd
@@ -5,6 +5,7 @@ set BOOTFILE=boot.wim
 set IMAGEFILE=install.wim
 set SCRIPT_SETTINGS=scripts\settings.cmd
 set CUSTOM_SETTINGS=custom\settings.cmd
+set SNAPCONTROL_INI=custom\snapcontrol.ini
 
 IF %1.==. GOTO USAGE
 
@@ -99,6 +100,12 @@ for %%A in (
   )
 )
 
+echo.
+echo removing mail password from snapcontrol.ini
+if EXIST %DRIVE%\tools\%SNAPCONTROL_INI% (
+  tools\searchreplace %DRIVE%\tools\%SNAPCONTROL_INI% "^.*MAILPASS.*=.*" "MailPass = DELETED"
+)
+
 echo.
 echo deleting ftpsettings.cmd ...
 del /F /Q %DRIVE%\tools\custom\ftpsettings.cmd