Index: /trunk/src/VBox/Installer/win/UserInterface.wxi
===================================================================
--- /trunk/src/VBox/Installer/win/UserInterface.wxi	(revision 58557)
+++ /trunk/src/VBox/Installer/win/UserInterface.wxi	(revision 58558)
@@ -394,13 +394,13 @@
                  Also see: http://osdir.com/ml/windows.devel.wix.user/2005-02/msg00300.html -->
             <Control Id="DesktopShortcutCheckBox" Type="CheckBox" X="25" Y="95" Width="200" Height="17"
-                Property="VBOXINSTALLDESKTOPSHORTCUT" CheckBoxValue="1">
+                     Property="VBOXINSTALLDESKTOPSHORTCUT" CheckBoxValue="1" Default="no">
                 <Text>!(loc.Customize2Dlg_CreateShortcut)</Text>
             </Control>
             <Control Id="QuicklaunchShortcutCheckBox" Type="CheckBox" X="25" Y="115" Width="200" Height="17"
-                     Property="VBOXINSTALLQUICKLAUNCHSHORTCUT" CheckBoxValue="1">
+                     Property="VBOXINSTALLQUICKLAUNCHSHORTCUT" CheckBoxValue="1" Default="no">
                 <Text>!(loc.Customize2Dlg_CreateQuickLaunch)</Text>
             </Control>
             <Control Id="RegisterFileExtensionsCheckBox" Type="CheckBox" X="25" Y="135" Width="200" Height="17"
-                     Property="VBOXREGISTERFILEEXTENSIONS" CheckBoxValue="1">
+                     Property="VBOXREGISTERFILEEXTENSIONS" CheckBoxValue="1" Default="no">
                 <Text>!(loc.Customize2Dlg_RegisterFileExtensions)</Text>
             </Control>
Index: /trunk/src/VBox/Installer/win/VirtualBox.wxs
===================================================================
--- /trunk/src/VBox/Installer/win/VirtualBox.wxs	(revision 58557)
+++ /trunk/src/VBox/Installer/win/VirtualBox.wxs	(revision 58558)
@@ -73,9 +73,25 @@
     <Property Id='REINSTALLMODE' Value='amus'/>
 
-    <!-- VirtualBox properties -->
+    <!-- VirtualBox properties (can be modified from command line) -->
+
+    <!-- Whether or not a desktop shortcut should be created. -->
     <Property Id="VBOXINSTALLDESKTOPSHORTCUT" Value="1" />
+    <SetProperty Id="VBOXINSTALLDESKTOPSHORTCUT" After="AppSearch" Sequence="both"
+                 Value="{}"><![CDATA[VBOXINSTALLDESKTOPSHORTCUT="0"]]></SetProperty>
+
+    <!-- Whether or not a desktop shortcut for the Quick Launch Bar should be created -->
     <Property Id="VBOXINSTALLQUICKLAUNCHSHORTCUT" Value="1" />
+    <SetProperty Id="VBOXINSTALLQUICKLAUNCHSHORTCUT" After="AppSearch" Sequence="both"
+                 Value="{}"><![CDATA[VBOXINSTALLQUICKLAUNCHSHORTCUT="0"]]></SetProperty>
+
+    <!-- Whether or not registering of known desktop shortcut for the Quick Launch Bar should be created -->
     <Property Id="VBOXREGISTERFILEEXTENSIONS" Value="1" />
+    <SetProperty Id="VBOXREGISTERFILEEXTENSIONS" After="AppSearch" Sequence="both"
+                 Value="{}"><![CDATA[VBOXREGISTERFILEEXTENSIONS="0"]]></SetProperty>
+
+    <!-- Whether or not VirtualBox should be started automatically right after successful installation -->
     <Property Id="VBOXSTART" Value="1" />
+    <SetProperty Id="VBOXSTART" After="AppSearch" Sequence="both"
+                 Value="{}"><![CDATA[VBOXSTART="0"]]></SetProperty>
 
     <!-- Make sure installation will not start on anything other but the NT family -->