diff --git a/cli/hoodie-defaults.js b/cli/hoodie-defaults.js
index 63a0225c3..0613553e2 100644
--- a/cli/hoodie-defaults.js
+++ b/cli/hoodie-defaults.js
@@ -8,6 +8,8 @@ function getHoodieDefaults () {
     data: '.hoodie',
     public: 'public',
     client: {},
+    account: {},
+    store: {},
     dbUrl: undefined,
     dbUrlPassword: undefined,
     dbUrlUsername: undefined,
diff --git a/cli/options.js b/cli/options.js
index 229506bb0..74ef3656c 100644
--- a/cli/options.js
+++ b/cli/options.js
@@ -127,6 +127,8 @@ function getCliOptions (projectPath) {
   options.plugins = defaults.plugins
   options.app = defaults.app
   options.client = defaults.client
+  options.account = defaults.account
+  options.store = defaults.store
 
   // If app has a hoodie folder, add it to the list of plugins
   if (fs.existsSync(path.join(projectPath, 'hoodie'))) {
diff --git a/cli/parse-options.js b/cli/parse-options.js
index 6929226a9..c22dfe517 100644
--- a/cli/parse-options.js
+++ b/cli/parse-options.js
@@ -39,7 +39,9 @@ function parseOptions (options) {
     plugins: options.plugins,
     app: options.app,
     inMemory: Boolean(options.inMemory),
-    client: options.client
+    client: options.client,
+    account: options.account,
+    store: options.store
   }
 
   log.level = config.loglevel
diff --git a/test/unit/cli/hoodie-default-test.js b/test/unit/cli/hoodie-default-test.js
index 367aeb6bc..d60427629 100644
--- a/test/unit/cli/hoodie-default-test.js
+++ b/test/unit/cli/hoodie-default-test.js
@@ -10,6 +10,8 @@ test('hoodie defaults test', function (group) {
       adminPassword: undefined,
       app: {},
       client: {},
+      account: {},
+      store: {},
       data: '.hoodie',
       dbAdapter: 'pouchdb-adapter-fs',
       dbUrl: undefined,