diff --git a/packages/cli/src/commands/init/index.js b/packages/cli/src/commands/init/index.js
index 708b50692e..c5ccd610c4 100644
--- a/packages/cli/src/commands/init/index.js
+++ b/packages/cli/src/commands/init/index.js
@@ -13,10 +13,10 @@ module.exports = {
     })
     yargs.positional("database", {
       type: "string",
-      describe: "database to use usually couch for dev",
+      describe: "use a local (PouchDB) or remote (CouchDB) database",
       alias: "b",
-      default: "pouch",
-      choices: ["pouch", "couch"],
+      default: "local",
+      choices: ["local", "remote"],
     })
     yargs.positional("clientId", {
       type: "string",
@@ -30,6 +30,12 @@ module.exports = {
       alias: "x",
       default: "",
     })
+    yargs.positional("quiet", {
+      type: "boolean",
+      describe: "flag - if set, then run in quiet mode - use all defaults",
+      alias: "q",
+      default: false,
+    })
   },
   handler,
 }
diff --git a/packages/cli/src/commands/init/initHandler.js b/packages/cli/src/commands/init/initHandler.js
index f7b900f472..9d34ef6c59 100644
--- a/packages/cli/src/commands/init/initHandler.js
+++ b/packages/cli/src/commands/init/initHandler.js
@@ -78,7 +78,7 @@ const createClientDatabse = async opts => {
 
 const createDevEnvFile = async opts => {
   const destConfigFile = join(opts.dir, "./.env")
-  let createConfig = !(await exists(destConfigFile))
+  let createConfig = !(await exists(destConfigFile)) || opts.quiet
   if (!createConfig) {
     const answers = await inquirer.prompt([
       {