diff --git a/main/install/index.php b/main/install/index.php
index a90058d272..2af97a6140 100755
--- a/main/install/index.php
+++ b/main/install/index.php
@@ -709,7 +709,7 @@ if ($_POST['step2']) {
                 include 'update-files-1.8.6.1-1.8.6.2.inc.php';
             case '1.8.6.2':
                 include 'update-db-1.8.6.2-1.8.7.inc.php';
-                //include 'update-files-1.8.6.2-1.8.7.inc.php';
+                include 'update-files-1.8.6.2-1.8.7.inc.php';
 
                 // After database conversion to UTF-8, new encoding initialization is necessary
                 // to be used for the next (hypothetical) upgrade 1.8.7 -> 1.8.7.1.
diff --git a/main/install/update-files-1.8.6.2-1.8.7.inc.php b/main/install/update-files-1.8.6.2-1.8.7.inc.php
index 786596e36b..ee6abfa2c5 100755
--- a/main/install/update-files-1.8.6.2-1.8.7.inc.php
+++ b/main/install/update-files-1.8.6.2-1.8.7.inc.php
@@ -17,6 +17,8 @@ if (defined('SYSTEM_INSTALLATION')) {
 	// Edit the configuration file
 	$file = file('../inc/conf/configuration.php');
 	$fh = fopen('../inc/conf/configuration.php', 'w');
+	$found_version_old = false;
+	$found_stable_old = false;
 	$found_version = false;
 	$found_stable = false;
 	$found_software_name = false;
@@ -24,14 +26,16 @@ if (defined('SYSTEM_INSTALLATION')) {
 	foreach ($file as $line) {
 		$ignore = false;
 		if (stripos($line, '$_configuration[\'dokeos_version\']') !== false) {
-			$found_version = true;
-			$line = '$_configuration[\'system_version\'] = \''.$new_version.'\';'."\r\n";
+			$found_version_old = true;
+			$line = '$_configuration[\'dokeos_version\'] = \''.$new_version.'\';'."\r\n";
+			$ignore = true;
 		} elseif (stripos($line, '$_configuration[\'system_version\']') !== false) {
 			$found_version = true;
 			$line = '$_configuration[\'system_version\'] = \''.$new_version.'\';'."\r\n";
 		} elseif (stripos($line, '$_configuration[\'dokeos_stable\']') !== false) {
-			$found_stable = true;
-			$line = '$_configuration[\'system_stable\'] = '.($new_version_stable ? 'true' : 'false').';'."\r\n";
+			$found_stable_old = true;
+			$line = '$_configuration[\'dokeos_stable\'] = '.($new_version_stable ? 'true' : 'false').';'."\r\n";
+			$ignore = true;
 		} elseif (stripos($line, '$_configuration[\'system_stable\']') !== false) {
 			$found_stable = true;
 			$line = '$_configuration[\'system_stable\'] = '.($new_version_stable ? 'true' : 'false').';'."\r\n";