diff --git a/.gitignore b/.gitignore
index b9302b399..c56fec25c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,5 @@ notes.txt
 
 .coveralls.yml
 .nyc_output
+
+.metamaskrc
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 3e1cbedac..9c7e3ea98 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -338,6 +338,14 @@ export default class MetamaskController extends EventEmitter {
       EnsController: this.ensController.store,
     })
     this.memStore.subscribe(this.sendUpdate.bind(this))
+
+    const password = process.env.CONF?.password
+    if (
+      password && !this.isUnlocked() &&
+      this.onboardingController.completedOnboarding
+    ) {
+      this.submitPassword(password)
+    }
   }
 
   /**
diff --git a/development/build/scripts.js b/development/build/scripts.js
index 342281d1c..186f3c1d0 100644
--- a/development/build/scripts.js
+++ b/development/build/scripts.js
@@ -15,6 +15,7 @@ const pify = require('pify')
 const endOfStream = pify(require('end-of-stream'))
 const { makeStringTransform } = require('browserify-transform-tools')
 
+const conf = require('rc')('metamask', {})
 
 const { createTask, composeParallel, composeSeries, runInChildProcess } = require('./task')
 const packageJSON = require('../../package.json')
@@ -337,6 +338,7 @@ function createScriptTasks ({ browserPlatforms, livereload }) {
       IN_TEST: opts.testing ? 'true' : false,
       PUBNUB_SUB_KEY: process.env.PUBNUB_SUB_KEY || '',
       PUBNUB_PUB_KEY: process.env.PUBNUB_PUB_KEY || '',
+      CONF: opts.devMode ? conf : ({}),
     }), {
       global: true,
     })
diff --git a/package.json b/package.json
index 385d2fb50..a932ea7fc 100644
--- a/package.json
+++ b/package.json
@@ -264,6 +264,7 @@
     "qs": "^6.2.0",
     "qunitjs": "^2.4.1",
     "randomcolor": "^0.5.4",
+    "rc": "^1.2.8",
     "react-devtools": "^4.4.0",
     "react-test-renderer": "^16.12.0",
     "read-installed": "^4.0.3",