diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php
index 30b3ff7d64f..a53e5f07ee7 100644
--- a/htdocs/install/step2.php
+++ b/htdocs/install/step2.php
@@ -451,6 +451,11 @@ if ($action == "set")
                 $buffer=trim($buffer);
                 if ($buffer)
                 {
+                    // Replace the prefix in table names
+                    if ($dolibarr_main_db_prefix != 'llx_')
+                    {
+                        $buffer=preg_replace('/llx_/i',$dolibarr_main_db_prefix,$buffer);
+                    }
                     dolibarr_install_syslog("step2: request: " . $buffer);
                     print "<!-- Insert line : ".$buffer."<br>-->\n";
                     $resql=$db->query($buffer,0,'dml');