diff --git a/var/config/service.database.php b/var/config/service.database.php
index af3841fce1..a5dc2be5f6 100644
--- a/var/config/service.database.php
+++ b/var/config/service.database.php
@@ -21,12 +21,22 @@
         'dsn'       => 'mysql:dbname=pi;host=localhost',
         'username'  => 'root',
         'password'  => '',
-        'options'   => array(
+
+        // driver_options. All attributes must be valid.
+        // @see http://www.php.net/manual/en/pdo.setattribute.php
+        'driver_options'   => array(
             PDO::MYSQL_ATTR_INIT_COMMAND    => 'SET NAMES utf8 COLLATE utf8_general_ci',
             PDO::ATTR_PERSISTENT            => false,
+
+            // Custom PDOstatement class. Optional, default as Pi\Db\Adapter\Driver\Statement
+            // PDO::ATTR_STATEMENT_CLASS       => array('PDOstatement'),
+        ),
+
+        // Add custom options in this section
+        'options'   => array(
+            // To build connection upload. Optional, default as true
+            'connect_onload'    => true,
         ),
-        // To build connection upload. Optional, default as true
-        'connect_onload'    => true,
     ),
 
     // Database schema
diff --git a/www/setup/src/Controller/Finish.php b/www/setup/src/Controller/Finish.php
index b13a0a4498..5ab8acd6ec 100644
--- a/www/setup/src/Controller/Finish.php
+++ b/www/setup/src/Controller/Finish.php
@@ -99,9 +99,9 @@ public function indexAction()
         $readPaths .= "</ul>";
 
         $message = <<<'HTML'
-<h2>Congratulatons, everything is done! <a href='../index.php'>Ready to visit your site?</a></h2>
+<h2>Congratulatons! The system is set up successfully. <a href='../index.php'>Click to visit your website!</a></h2>
 <h3>Security advisory</h3>
-<ol>For security considerations you are strongly recommended to complete the following actions:
+<ol>For security considerations please make sure the following operations are done:
     <li>Remove the installation folder <strong>%s</strong> from your server.</li>
     <li>Set configuration directories and files to readonly: %s</li>
 </ol>