diff --git a/packages/strapi-bookshelf/lib/utils/connectivity.js b/packages/strapi-bookshelf/lib/utils/connectivity.js
index 74a8526711..3d0025a8cc 100644
--- a/packages/strapi-bookshelf/lib/utils/connectivity.js
+++ b/packages/strapi-bookshelf/lib/utils/connectivity.js
@@ -9,11 +9,13 @@ const logger = require('strapi-utils').logger;
 module.exports = (scope, success, error) => {
   const knex  = require(`${scope.rootPath}_/node_modules/knex`)({
     client: scope.client.module,
-    connection: scope.database
+    connection: Object.assign(scope.database, {
+      user: scope.database.username
+    })
   });
 
   knex.raw('select 1+1 as result').then(() => {
-    logger.info('Database connection is a success!');
+    logger.info('The app has been connected to the database successfully');
     knex.destroy();
     execSync(`rm -r ${scope.rootPath}_`);
 
@@ -22,7 +24,7 @@ module.exports = (scope, success, error) => {
     success();
   })
   .catch(() => {
-    logger.warn('Database connection failed!');
+    logger.warn('Database connection has failed! Make sure your database is running.');
     error();
   });
 };
diff --git a/packages/strapi-generate-new/lib/before.js b/packages/strapi-generate-new/lib/before.js
index 10a4700b38..7523712873 100755
--- a/packages/strapi-generate-new/lib/before.js
+++ b/packages/strapi-generate-new/lib/before.js
@@ -53,7 +53,7 @@ module.exports = (scope, cb) => {
   scope.database = {};
 
   const connectionValidation = () => {
-    const databaseChoises = [
+    const databaseChoices = [
       {
         name: 'MongoDB (highly recommended)',
         value: {
@@ -100,11 +100,11 @@ module.exports = (scope, cb) => {
         type: 'list',
         prefix: '',
         name: 'client',
-        message: 'Choose your database:',
-        choices: databaseChoises,
+        message: 'Choose your main database:',
+        choices: databaseChoices,
         default: () => {
           if (scope.client) {
-            return _.findIndex(databaseChoises, { value: _.omit(scope.client, ['version'])});
+            return _.findIndex(databaseChoices, { value: _.omit(scope.client, ['version'])});
           }
         }
       }
diff --git a/packages/strapi-mongoose/lib/utils/connectivity.js b/packages/strapi-mongoose/lib/utils/connectivity.js
index 1a1e5bd598..daf03b2f72 100644
--- a/packages/strapi-mongoose/lib/utils/connectivity.js
+++ b/packages/strapi-mongoose/lib/utils/connectivity.js
@@ -11,11 +11,11 @@ module.exports = (scope, success, error) => {
 
   Mongoose.connect(`mongodb://${ (scope.database.username && scope.database.password) ? `${scope.database.username}:${scope.database.password}@` : '' }${scope.database.host}:${scope.database.port}/${scope.database.database}`, function (err) {
     if (err) {
-      logger.warn('Database connection failed!');
+      logger.warn('Database connection has failed! Make sure your database is running.');
       return error();
     }
 
-    logger.info('Database connection is a success!');
+    logger.info('The app has been connected to the database successfully!');
 
     Mongoose.connection.close();
 
diff --git a/packages/strapi-redis/lib/utils/connectivity.js b/packages/strapi-redis/lib/utils/connectivity.js
index 282590b4c6..25e695ab17 100644
--- a/packages/strapi-redis/lib/utils/connectivity.js
+++ b/packages/strapi-redis/lib/utils/connectivity.js
@@ -19,11 +19,11 @@ module.exports = (scope, success, error) => {
     redis.disconnect();
 
     if (err) {
-      logger.warn('Database connection failed!');
+      logger.warn('Database connection has failed! Make sure your database is running.');
       return error();
     }
 
-    logger.info('Database connection is a success!');
+    logger.info('The app has been connected to the database successfully!');
 
     execSync(`rm -r ${scope.rootPath}_`);