diff --git a/packages/thunderbird-config.xml b/packages/thunderbird-config.xml
index e9dd313..568714d 100644
--- a/packages/thunderbird-config.xml
+++ b/packages/thunderbird-config.xml
@@ -11,12 +11,12 @@
         <variable architecture='x86' name='PROG' value='%PROGRAMFILES%\Mozilla Thunderbird' />
         <variable architecture='x64' name='PROG' value='%PROGRAMFILES(x86)%\Mozilla Thunderbird' />
 
-        <install cmd='copy /Y "%SOFTWARE%\thunderbird\autoconf.js" "%PROG%\defaults\pref\"' />
-        <install cmd='copy /Y "%SETTINGS%\thunderbird\thunderbird.cfg" "%PROG%\"' />
+        <install cmd='%COMSPEC% /C copy /Y "%SOFTWARE%\thunderbird\autoconf.js" "%PROG%\defaults\pref\"' />
+        <install cmd='%COMSPEC% /C copy /Y "%SETTINGS%\thunderbird\thunderbird.cfg" "%PROG%\"' />
 
         <upgrade include="install" />
 
-        <remove cmd='del /F "%PROG%\defaults\pref\autoconf.js"' />
-        <remove cmd='del /F "%PROG%\thunderbird.cfg"' />
+        <remove cmd='%COMSPEC% /C del /F "%PROG%\defaults\pref\autoconf.js"' />
+        <remove cmd='%COMSPEC% /C del /F "%PROG%\thunderbird.cfg"' />
     </package>
 </packages>
diff --git a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/thunderbird/thunderbird.cfg/10All b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/thunderbird/thunderbird.cfg/10All
index 829fe93..e927f96 100644
--- a/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/thunderbird/thunderbird.cfg/10All
+++ b/root/etc/e-smith/templates/home/e-smith/files/shares/wpkg/files/settings/thunderbird/thunderbird.cfg/10All
@@ -8,6 +8,6 @@ var mail = env_user + '@{$DomainName}';
 
 lockPref("mail.identity.useremail", mail);
 lockPref("autoadmin.append_emailaddr", true);
-lockPref("autoadmin.global_config_url", "http://{$SystemName.$DomainName}/thunderbird.cfg");
+lockPref("autoadmin.global_config_url", "http://{"$SystemName.$DomainName"}/thunderbird.cfg");
 lockPref("autoadmin.failover_to_cached", true);
 lockPref("autoadmin.offline_failover", true);