Index: source/wix/mysql_common_ui.xml
===================================================================
--- source/wix/mysql_common_ui.xml	(revision 138)
+++ source/wix/mysql_common_ui.xml	(working copy)
@@ -51,11 +51,10 @@
       NoMinimize="yes">
       <Control Id="OK" Type="PushButton" X="230" Y="243" Width="66" Height="17" Default="yes" Cancel="yes"
         Text="&amp;Finish">
+        <Publish Event="DoAction" Value="ConfigureServer">ConfigureServer And NOT Installed And ACTION="INSTALL" And $ServerInstanceConfig=3</Publish>
         <!-- -->
-        <Publish Event="DoAction" Value="PostRegistration.SetProperty">NOT Installed And ACTION="INSTALL" And $ServerInstanceConfig=3</Publish>
-        <Publish Event="DoAction" Value="PostRegistration">NOT Installed And ACTION="INSTALL" And $ServerInstanceConfig=3</Publish>
-       
-        <Publish Event="DoAction" Value="ConfigureServer">ConfigureServer And NOT Installed And ACTION="INSTALL" And $ServerInstanceConfig=3</Publish>
+        <Publish Event="DoAction" Value="PostRegistration.SetProperty">RegisterServer And NOT Installed And ACTION="INSTALL"</Publish>
+        <Publish Event="DoAction" Value="PostRegistration">RegisterServer And NOT Installed And ACTION="INSTALL"</Publish>        
         <Publish Event="EndDialog" Value="Exit">1</Publish>
       </Control>
       <Control Id="Cancel" Type="PushButton" X="301" Y="243" Width="66" Height="17" Disabled="yes"
@@ -84,6 +83,20 @@
         <Text>Use this option to generate an optimized MySQL config file, setup a Windows service running on a dedicated port and to set the password for the root account.</Text>
         <Condition Action="show">NOT Installed And ACTION="INSTALL" And $ServerInstanceConfig=3</Condition>
       </Control>
+      
+      <Control Id="RegisterServerCBox" Type="CheckBox" X="135" Y="148" Width="11" Height="11" 
+        Property="RegisterServer" Integer="yes" Hidden="yes" CheckBoxValue="1">
+        <Condition Action="show">RegisterServer And NOT Installed And ACTION="INSTALL"</Condition>
+      </Control>
+      <Control Id="RegisterServerLbl" Type="Text" X="148" Y="148" Width="208" Height="11" Hidden="yes" Transparent="yes">
+        <Text>{&amp;TahomaBold8}Register the MySQL Server now</Text>
+        <Condition Action="show">RegisterServer And NOT Installed And ACTION="INSTALL"</Condition>
+      </Control>
+      <Control Id="RegisterServerDescLbl" Type="Text" X="148" Y="160" Width="208" Height="48" Hidden="yes" Transparent="yes">
+        <Text>Use this option to register this MySQL server with SunConnect service, to receive automatic update notifications on future releases and other free offerings. A browser window will open briefly to allow you to complete the registration.</Text>
+        <Condition Action="show">RegisterServer And NOT Installed And ACTION="INSTALL"</Condition>
+      </Control>      
+      
       <Control Id="DlgLine" Type="Line" X="0" Y="234" Width="374" Height="0" />
       <Control Id="TextLine1" Type="Text" X="135" Y="8" Width="225" Height="45" Transparent="yes">
         <Text>{&amp;TahomaBold10}Wizard Completed</Text>
Index: source/wix/mysql_server_registration.xml
===================================================================
--- source/wix/mysql_server_registration.xml	(revision 138)
+++ source/wix/mysql_server_registration.xml	(working copy)
@@ -14,6 +14,7 @@
         <Property Id='NewURN' Value='Set via CustomActions' />
         <Property Id='InstanceUrn' Value=' ' />
         <Property Id='RegistryUrn' Value=' ' />
+        <Property Id="RegisterServer">1</Property>
     </Fragment>
     
     <!-- Custom Actions -->