diff --git a/core/lib/Thelia/Install/CheckDatabaseConnection.php b/core/lib/Thelia/Install/CheckDatabaseConnection.php
index a2a18853e..c9c2060f5 100644
--- a/core/lib/Thelia/Install/CheckDatabaseConnection.php
+++ b/core/lib/Thelia/Install/CheckDatabaseConnection.php
@@ -96,11 +96,11 @@ class CheckDatabaseConnection extends BaseInstall
     public function exec()
     {
 
-        $dsn = "mysql:host=%s";
+        $dsn = "mysql:host=%s;port=%s";
 
         try {
             $this->connection = new \PDO(
-                sprintf($dsn, $this->host),
+                sprintf($dsn, $this->host, $this->port),
                 $this->user,
                 $this->password
             );
diff --git a/web/install/bdd.php b/web/install/bdd.php
index 059a25eb8..05fcfe762 100644
--- a/web/install/bdd.php
+++ b/web/install/bdd.php
@@ -51,7 +51,7 @@ $connection = $checkConnection->getConnection();
 $databases = $connection->query('show databases');
 ?>
     <div class="well">
-        <form action="config.php">
+        <form action="config.php" method="post">
             <fieldset>
                 <legend>Choose your database</legend>
                 <p>
@@ -107,6 +107,12 @@ $databases = $connection->query('show databases');
                 </div>
                 <?php } ?>
             </fieldset>
+            <div class="clearfix">
+                <div class="control-btn">
+                    <button type="submit" class="pull-right btn btn-default btn-primary">Continue</button>
+                </div>
+
+            </div>
         </form>
     </div>
 
diff --git a/web/install/config.php b/web/install/config.php
new file mode 100644
index 000000000..249f7c033
--- /dev/null
+++ b/web/install/config.php
@@ -0,0 +1,110 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+$step = 4;
+include("header.php");
+global $thelia;
+$err = isset($_GET['err']) && $_GET['err'];
+
+if (!$err) {
+    $checkConnection = new \Thelia\Install\CheckDatabaseConnection($_SESSION['install']['host'], $_SESSION['install']['username'], $_SESSION['install']['password'], $_SESSION['install']['port']);
+    $connection = $checkConnection->getConnection();
+    $connection->exec("SET NAMES UTF8");
+    $database = new \Thelia\Install\Database($connection);
+
+    if (isset($_POST['database'])) {
+        $_SESSION['install']['database'] = $_POST['database'];
+    }
+
+    if (isset($_POST['database_create']) && $_POST['database_create'] != "") {
+        $_SESSION['install']['database'] = $_POST['database_create'];
+        $database->createDatabase($_SESSION['install']['database']);
+    }
+
+    if (!$connection->exec(sprintf('use %s', $_SESSION['install']['database']))) {
+        header('location: bdd.php?err=1');
+    }
+
+    $database->insertSql($_SESSION['install']['database']);
+
+    if(!file_exists(THELIA_ROOT . "/local/config/database.yml")) {
+        $fs = new \Symfony\Component\Filesystem\Filesystem();
+
+        $sampleConfigFile = THELIA_ROOT . "/local/config/database.yml.sample";
+        $configFile = THELIA_ROOT . "/local/config/database.yml";
+
+        $fs->copy($sampleConfigFile, $configFile, true);
+
+        $configContent = file_get_contents($configFile);
+
+        $configContent = str_replace("%DRIVER%", "mysql", $configContent);
+        $configContent = str_replace("%USERNAME%", $_SESSION['install']['username'], $configContent);
+        $configContent = str_replace("%PASSWORD%", $_SESSION['install']['password'], $configContent);
+        $configContent = str_replace(
+            "%DSN%",
+            sprintf("mysql:host=%s;dbname=%s;port=%s", $_SESSION['install']['host'], $_SESSION['install']['database'], $_SESSION['install']['port']),
+            $configContent
+        );
+
+        file_put_contents($configFile, $configContent);
+
+        // FA - no, as no further install will be possible
+        // $fs->remove($sampleConfigFile);
+
+        $fs->remove($thelia->getContainer()->getParameter("kernel.cache_dir"));
+    }
+}
+
+?>
+<form action="end.php" method="POST" >
+    <div class="well">
+        <div class="form-group">
+            <label for="admin_login">Administrator login :</label>
+            <input id="admin_login" class="form-control" type="text" name="admin_login" placeholder="admin" value="" required>
+        </div>
+        <div class="form-group">
+            <label for="admin_password">Administrator password :</label>
+            <input id="admin_password" class="form-control" type="password" name="admin_password" value="" required>
+        </div>
+        <div class="form-group">
+            <label for="admin_password_verif">Administrator password verification :</label>
+            <input id="admin_password_verif" class="form-control" type="password" name="admin_password_verif" value="" required>
+        </div>
+        <div class="form-group">
+            <label for="email_contact">Contact email :</label>
+            <input id="email_contact" class="form-control" type="text" name="email_contact" placeholder="foo@bar.com" value="" required>
+        </div>
+        <div class="form-group">
+            <label for="site_name">Site name :</label>
+            <input id="site_name" class="form-control" type="text" name="site_name" placeholder="" value="" required>
+        </div>
+        <div class="form-group">
+            <label for="site_name">Site name :</label>
+            <input id="site_name" class="form-control" type="text" name="site_name" placeholder="" value="" required>
+        </div>
+
+
+    </div>
+
+</form>
+
diff --git a/web/install/connection.php b/web/install/connection.php
index 2d68c5cac..fdbddfafd 100644
--- a/web/install/connection.php
+++ b/web/install/connection.php
@@ -49,7 +49,7 @@ $_SESSION['install']['step'] = 3;
                 <label for="password">Password :</label>
                 <input id="password" type="password" class="form-control" name="password" placeholder="l33t 5p34k" >
             </div>
-            <div class="form-group{if $error} has-error{/if}">
+            <div class="form-group">
                 <label for="port">Port :</label>
                 <input id="port" type="text" class="form-control" name="port" value="<?php if(isset($_SESSION['install']['port'])){ echo $_SESSION['install']['port']; } else { echo '3306'; } ?>">
             </div>