diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.Contact.xml b/modules/itop-config-mgmt-1.0.0/data.sample.Contact.xml
index 1ca5acd0e..cefce0dd6 100644
--- a/modules/itop-config-mgmt-1.0.0/data.sample.Contact.xml
+++ b/modules/itop-config-mgmt-1.0.0/data.sample.Contact.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Set>
-<Person alias="Contact" id="3">
+<Person alias="Contact" id="1">
+<name>Picasso</name>
+<status>active</status>
+<org_id>2</org_id>
+<email>pablo@combodo.com</email>
+<phone></phone>
+<location_id>3</location_id>
+<first_name>Pablo</first_name>
+<employee_id></employee_id>
+</Person><Person alias="Contact" id="3">
 <name>Dali</name>
 <status>active</status>
 <org_id>2</org_id>
diff --git a/modules/itop-service-mgmt-1.0.0/data.sample.Contract.xml b/modules/itop-service-mgmt-1.0.0/data.sample.Contract.xml
index 061917896..b465e0645 100644
--- a/modules/itop-service-mgmt-1.0.0/data.sample.Contract.xml
+++ b/modules/itop-service-mgmt-1.0.0/data.sample.Contract.xml
@@ -10,7 +10,7 @@
 <cost_unit></cost_unit>
 <billing_frequency></billing_frequency>
 <org_id>2</org_id>
-<provider_id>1</provider_id>
+<provider_id>2</provider_id>
 <support_team_id>2</support_team_id>
 </CustomerContract>
 <CustomerContract alias="Contract" id="2">
@@ -23,7 +23,7 @@
 <cost_unit></cost_unit>
 <billing_frequency></billing_frequency>
 <org_id>2</org_id>
-<provider_id>1</provider_id>
+<provider_id>2</provider_id>
 <support_team_id>4</support_team_id>
 </CustomerContract>
 </Set>
\ No newline at end of file
diff --git a/modules/itop-service-mgmt-1.0.0/data.sample.Service.xml b/modules/itop-service-mgmt-1.0.0/data.sample.Service.xml
index cf1461167..c6329e6bb 100644
--- a/modules/itop-service-mgmt-1.0.0/data.sample.Service.xml
+++ b/modules/itop-service-mgmt-1.0.0/data.sample.Service.xml
@@ -1,3 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Set>
-</Set>
\ No newline at end of file
+<Service alias="Service" id="1">
+<org_id>2</org_id>
+<name>HW Management</name>
+<description>Hardware support and repair</description>
+<type>IncidentManagement</type>
+<status>production</status>
+</Service>
+<Service alias="Service" id="2">
+<org_id>2</org_id>
+<name>NW Management</name>
+<description>LAN and WAN support and troubleshooting</description>
+<type>IncidentManagement</type>
+<status>production</status>
+</Service>
+</Set>
diff --git a/setup/index.php b/setup/index.php
index fc96082da..47fd698cc 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -775,8 +775,12 @@ function ModulesSelection(SetupWebPage $oP, $aParamValues, $iCurrentStep, $oConf
 	$aSelectedModules = $aParamValues['module'];
 	if ($aSelectedModules == '')
 	{
-		// Make sure it gets initialized as an array
+		// Make sure it gets initialized as an array, default value: all modules selected !
 		$aSelectedModules = array();
+		foreach($aAvailableModules as $sModuleId => $aModule)
+		{
+			$aSelectedModules[] = $sModuleId;
+		}
 	}
 	foreach($aAvailableModules as $sModuleId => $aModule)
 	{