diff --git a/src/database/mongo.js b/src/database/mongo.js
index 7dd854e4cf..25d34ce02b 100644
--- a/src/database/mongo.js
+++ b/src/database/mongo.js
@@ -33,6 +33,7 @@
 			name: 'mongo:password',
 			description: 'Password of your MongoDB database',
 			hidden: true,
+			default: nconf.get('mongo:password') || '',
 			before: function(value) { value = value || nconf.get('mongo:password') || ''; return value; }
 		},
 		{
diff --git a/src/database/redis.js b/src/database/redis.js
index 239090aa95..8af568b5d9 100644
--- a/src/database/redis.js
+++ b/src/database/redis.js
@@ -25,6 +25,7 @@
 			name: 'redis:password',
 			description: 'Password of your Redis database',
 			hidden: true,
+			default: nconf.get('redis:password') || '',
 			before: function(value) { value = value || nconf.get('redis:password') || ''; return value; }
 		},
 		{
diff --git a/src/install.js b/src/install.js
index 900a0e3ee4..f9fae4ffdf 100644
--- a/src/install.js
+++ b/src/install.js
@@ -43,8 +43,8 @@ questions.optional = [
 ];
 
 function checkSetupFlag(next) {
-	var	envSetupKeys = ['database'],
-		setupVal;
+	var setupVal;
+
 	try {
 		if (nconf.get('setup')) {
 			setupVal = JSON.parse(nconf.get('setup'));
@@ -74,14 +74,10 @@ function checkSetupFlag(next) {
 
 			process.exit();
 		}
-	} else if (envSetupKeys.every(function(key) {
-		return nconf.stores.env.store.hasOwnProperty(key);
-	})) {
-		install.values = envSetupKeys.reduce(function(config, key) {
-			config[key] = nconf.stores.env.store[key];
-			return config;
-		}, {});
-
+	} else if (nconf.get('database')) {
+		install.values = {
+			database: nconf.get('database')
+		};
 		next();
 	} else {
 		next();