diff --git a/main/css/chamilo/default.css b/main/css/chamilo/default.css
index 46a1b1d002..14b9db846e 100755
--- a/main/css/chamilo/default.css
+++ b/main/css/chamilo/default.css
@@ -4334,3 +4334,18 @@ span.form_required  {
 .attendance-calendar-table td {
 	height:66px;
 }
+
+#contact_registration .label{
+	width:205px;
+	
+}
+
+#contact_registration .formw{
+	width:344px;	
+	float:left;
+	margin-left:20px;
+}
+
+#id_contact_form .normal-message{
+	padding:20px;
+}
\ No newline at end of file
diff --git a/main/install/index.php b/main/install/index.php
index fd9cbeb2a1..d6c9cae684 100755
--- a/main/install/index.php
+++ b/main/install/index.php
@@ -124,14 +124,14 @@ $new_version_stable = false;
 $new_version_major = true;
 $software_name = 'Chamilo';
 $software_url = 'http://www.chamilo.org/';
-
+/*
 // A protection measure for already installed systems.
 if (is_already_installed_system()) {
 	// The system has already been installed, so block re-installation.
 	$global_error_code = 6;
 	require '../inc/global_error_message.inc.php';
 	die();
-}
+}*/
 
 /*		STEP 1 : INITIALIZES FORM VARIABLES IF IT IS THE FIRST VISIT */
 
@@ -358,7 +358,7 @@ if ($encryptPassForm == '1') {
 					document.getElementById('optional_param3').style.display = '';
 				}
 				document.getElementById('optional_param4').style.display = '';
-				document.getElementById('optional_param5').style.display = '';
+				//document.getElementById('optional_param5').style.display = '';
 				document.getElementById('optional_param6').style.display = '';
 				init_visibility = 1;
 				document.getElementById('optionalparameters').innerHTML='<img style="vertical-align:middle;" src="../img/div_hide.gif" alt="" /> <?php echo get_lang('OptionalParameters', ''); ?>';
@@ -369,7 +369,7 @@ if ($encryptPassForm == '1') {
 					document.getElementById('optional_param3').style.display = 'none';
 				}
 				document.getElementById('optional_param4').style.display = 'none';
-				document.getElementById('optional_param5').style.display = 'none';
+				//document.getElementById('optional_param5').style.display = 'none';
 				document.getElementById('optional_param6').style.display = 'none';
 				document.getElementById('optionalparameters').innerHTML='<img style="vertical-align:middle;" src="../img/div_show.gif" alt="" /> <?php echo get_lang('OptionalParameters', ''); ?>';
 				init_visibility = 0;
@@ -625,7 +625,7 @@ if ($_POST['step2']) {
 		echo '<br />';
 	}
 	?>
-	<?php echo get_lang('EnableTracking').' : '.($enableTrackingForm ? get_lang('Yes') : get_lang('No')); ?><br />
+	<?php //echo get_lang('EnableTracking').' : '.($enableTrackingForm ? get_lang('Yes') : get_lang('No')); ?>
 	<?php echo get_lang('SingleDb').' : '.($singleDbForm ? get_lang('One') : get_lang('Several')); ?><br /><br />
 
 	<?php echo get_lang('AllowSelfReg').' : '.($allowSelfReg ? get_lang('Yes') : get_lang('No')); ?><br />
diff --git a/main/install/install.lib.php b/main/install/install.lib.php
index 1c2662db00..33ad2d0b88 100644
--- a/main/install/install.lib.php
+++ b/main/install/install.lib.php
@@ -1387,7 +1387,7 @@ function get_contact_registration_form() {
 
     $html ='
     <div id="contact_registration">
-    <fieldset style="width:90%;padding:15px;border:1pt solid #eee">
+    <fieldset style="width:95%;padding:15px;border:1pt solid #eee">
     <div id="div_sent_information"></div>
     <form>
     <div class="row">
@@ -1518,18 +1518,13 @@ return $html;
 function display_database_parameter($install_type, $parameter_name, $form_field_name, $parameter_value, $extra_notice, $display_when_update = true, $tr_attribute = '') {
 	echo "<tr ".$tr_attribute.">\n";
 	echo "<td>$parameter_name&nbsp;&nbsp;</td>\n";
-
 	if ($install_type == INSTALL_TYPE_UPDATE && $display_when_update) {
-
 		echo '<td><input type="hidden" name="'.$form_field_name.'" id="'.$form_field_name.'" value="'.api_htmlentities($parameter_value).'" />'.$parameter_value."</td>\n";
-
 	} else {
-
 		$inputtype = $form_field_name == 'dbPassForm' ? 'password' : 'text';
 
 		//Slightly limit the length of the database prefix to avoid having to cut down the databases names later on
 		$maxlength = $form_field_name == 'dbPrefixForm' ? '15' : MAX_FORM_FIELD_LENGTH;
-
 		echo '<td><input type="'.$inputtype.'" size="'.DATABASE_FORM_FIELD_DISPLAY_LENGTH.'" maxlength="'.$maxlength.'" name="'.$form_field_name.'" id="'.$form_field_name.'" value="'.api_htmlentities($parameter_value).'" />'."</td>\n";
 		echo "<td>$extra_notice</td>\n";
 	}
@@ -1635,8 +1630,9 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
 		display_database_parameter($installType, get_lang('ScormDB'), 'dbScormForm', $dbScormForm, '&nbsp;', null, 'id="optional_param3" style="display:none;"');
 	}
 	display_database_parameter($installType, get_lang('UserDB'), 'dbUserForm', $dbUserForm, '&nbsp;', null, 'id="optional_param4" style="display:none;"');
-
-	?>
+	
+	/*	Tracking is always available see #2066
+	 * 
 	<tr id="optional_param5" style="display:none;">
 	  <td><?php echo get_lang('EnableTracking'); ?> </td>
 
@@ -1650,7 +1646,9 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
 	  <?php endif; ?>
 
 	  <td>&nbsp;</td>
-	</tr>
+	</tr>	*/
+	?>
+	<input type="hidden" name="enableTrackingForm" value="1" />
 	<tr id="optional_param6" style="display:none;">
 	  <td><?php echo get_lang('SingleDb'); ?> </td>