diff --git a/main/install/install.lib.php b/main/install/install.lib.php
index 63853d9efa..b215e91d68 100755
--- a/main/install/install.lib.php
+++ b/main/install/install.lib.php
@@ -630,9 +630,11 @@ function test_db_connect($dbHostForm, $dbUsernameForm, $dbPassForm, $singleDbFor
         //Checking database creation
         if ($check_user_can_create_databases) {
             @Database::query("set session sql_mode='';"); // Disabling special SQL modes (MySQL 5)        
-            $multipleDbCheck = @Database::query("CREATE DATABASE ".$dbPrefixForm."test_chamilo_connection");
+            //$multipleDbCheck = @Database::query("CREATE DATABASE ".$dbPrefixForm."test_chamilo_connection");
+            $multipleDbCheck = @Database::query("CREATE DATABASE ".$dbNameForm);
             if ($multipleDbCheck !== false) {
-                $multipleDbCheck = @Database::query("DROP DATABASE IF EXISTS ".$dbPrefixForm."test_chamilo_connection");
+                //$multipleDbCheck = @Database::query("DROP DATABASE IF EXISTS ".$dbPrefixForm."test_chamilo_connection");
+                $multipleDbCheck = @Database::query("DROP DATABASE IF EXISTS ".$dbNameForm);
                 if ($multipleDbCheck !== false) {
                     $dbConnect = 1;
                 } else {