diff --git a/app/extensions.js b/app/extensions.js
index ce530a92172..b2fe1b1ce4a 100644
--- a/app/extensions.js
+++ b/app/extensions.js
@@ -9,6 +9,8 @@ const settings = require('../js/constants/settings')
 const {passwordManagers, extensionIds} = require('../js/constants/passwordManagers')
 const appStore = require('../js/stores/appStore')
 const extensionState = require('./common/state/extensionState')
+const fs = require('fs')
+const path = require('path')
 
 let generateBraveManifest = () => {
   let baseManifest = {
@@ -173,7 +175,7 @@ module.exports.init = () => {
     const extensionPath = extensions.getIn([extensionId, 'filePath'])
     // If we don't have info on the extension yet, check for an update / install
     if (!extensionPath) {
-      defaultSession.updateClient.install(extensionId)
+      defaultSession.updateClient.checkNow(extensionId)
     } else {
       installExtension(extensionId, extensionPath)
     }
@@ -192,9 +194,24 @@ module.exports.init = () => {
     enableExtension(installInfo.id)
   }
 
-  let installExtension = (extensionId, path, options = {}) => {
+  let installExtension = (extensionId, extensionPath, options = {}) => {
     if (!installedExtensions[extensionId]) {
-      process.emit('load-extension', path, options, extensionInstalled)
+      if (extensionId === config.braveExtensionId) {
+        process.emit('load-extension', extensionPath, options, extensionInstalled)
+        return
+      }
+      // Verify we don't have info about an extension which doesn't exist
+      // on disk anymore.  It will crash if it doesn't exist, so this is
+      // just a safety net.
+      fs.exists(path.join(extensionPath, 'manifest.json'), (exists) => {
+        console.log('paht exists', extensionPath, exists)
+        if (exists) {
+          process.emit('load-extension', extensionPath, options, extensionInstalled)
+        } else {
+          delete installedExtensions[extensionId]
+          defaultSession.updateClient.checkNow(extensionId)
+        }
+      })
     } else {
       enableExtension(extensionId)
     }
diff --git a/app/renderer/components/browserActionButton.js b/app/renderer/components/browserActionButton.js
index d1a856d1e65..acd42a0fe23 100644
--- a/app/renderer/components/browserActionButton.js
+++ b/app/renderer/components/browserActionButton.js
@@ -39,6 +39,7 @@ class BrowserActionButton extends ImmutableComponent {
         backgroundRepeat: 'no-repeat',
         backgroundPosition: 'center'
       }}
+      dataButtonValue={this.props.extensionId}
       onClick={this.onClicked.bind(this, this.props.extensionId, this.props.browserAction.get('title'))} />
   }
 }
diff --git a/js/components/button.js b/js/components/button.js
index bd9c2e7974e..bce5a99d10f 100644
--- a/js/components/button.js
+++ b/js/components/button.js
@@ -12,6 +12,7 @@ class Button extends ImmutableComponent {
       return <span disabled={this.props.disabled}
         data-l10n-id={this.props.l10nId}
         style={this.props.inlineStyles}
+        data-button-value={this.props.dataButtonValue}
         className={cx({
           browserButton: true,
           fa: true,
diff --git a/test/about/extensionsTest.js b/test/about/extensionsTest.js
index cb2dce4341f..61734ba9364 100644
--- a/test/about/extensionsTest.js
+++ b/test/about/extensionsTest.js
@@ -3,12 +3,13 @@
 const Brave = require('../lib/brave')
 const {urlInput} = require('../lib/selectors')
 const {getTargetAboutUrl} = require('../../js/lib/appUrlUtil')
+const settingsConst = require('../../js/constants/settings')
+const {passwordManagers, extensionIds} = require('../../js/constants/passwordManagers')
+const aboutExtensionsUrl = getTargetAboutUrl('about:extensions')
 
 describe('about:extensions', function () {
-  Brave.beforeAll(this)
-  before(function * () {
-    const url = getTargetAboutUrl('about:extensions')
-    yield this.app.client
+  function * setup (client) {
+    yield client
       .waitUntilWindowLoaded()
       .waitForUrl(Brave.newTabUrl)
       .waitForBrowserWindow()
@@ -17,11 +18,58 @@ describe('about:extensions', function () {
       .windowByUrl(Brave.browserWindowUrl)
       .waitForExist('.tab[data-frame-key="1"]')
       .tabByIndex(0)
-      .url(url)
+      .url(aboutExtensionsUrl)
+  }
+  describe('PDFJS', function () {
+    Brave.beforeAll(this)
+    before(function * () {
+      yield setup(this.app.client)
+    })
+    it('installs by default', function * () {
+      yield this.app.client
+        .waitForVisible('[data-extension-id="oemmndcbldboiebfnladdacbdfmadadm"]')
+    })
   })
-
-  it('lists PDFJS', function * () {
-    yield this.app.client
-      .waitForVisible('[data-extension-id="oemmndcbldboiebfnladdacbdfmadadm"]')
+  describe('1Password', function () {
+    Brave.beforeAll(this)
+    before(function * () {
+      yield setup(this.app.client)
+    })
+    it('installs when enabled', function * () {
+      yield this.app.client
+        .windowByUrl(Brave.browserWindowUrl)
+        .changeSetting(settingsConst.ACTIVE_PASSWORD_MANAGER, passwordManagers.ONE_PASSWORD)
+        .waitForVisible(`.extensionBrowserAction[data-button-value="${extensionIds[passwordManagers.ONE_PASSWORD]}"]`)
+        .tabByIndex(0)
+        .waitForVisible(`[data-extension-id="${extensionIds[passwordManagers.ONE_PASSWORD]}"]`)
+    })
+  })
+  describe('Dashlane installs when enabled', function () {
+    Brave.beforeAll(this)
+    before(function * () {
+      yield setup(this.app.client)
+    })
+    it('installs', function * () {
+      yield this.app.client
+        .windowByUrl(Brave.browserWindowUrl)
+        .changeSetting(settingsConst.ACTIVE_PASSWORD_MANAGER, passwordManagers.DASHLANE)
+        .waitForVisible(`.extensionBrowserAction[data-button-value="${extensionIds[passwordManagers.DASHLANE]}"]`)
+        .tabByIndex(0)
+        .waitForVisible(`[data-extension-id="${extensionIds[passwordManagers.DASHLANE]}"]`)
+    })
+  })
+  describe('LastPass installs when enabled', function () {
+    Brave.beforeAll(this)
+    before(function * () {
+      yield setup(this.app.client)
+    })
+    it('installs', function * () {
+      yield this.app.client
+        .windowByUrl(Brave.browserWindowUrl)
+        .changeSetting(settingsConst.ACTIVE_PASSWORD_MANAGER, passwordManagers.LAST_PASS)
+        .waitForVisible(`.extensionBrowserAction[data-button-value="${extensionIds[passwordManagers.LAST_PASS]}"]`)
+        .tabByIndex(0)
+        .waitForVisible(`[data-extension-id="${extensionIds[passwordManagers.LAST_PASS]}"]`)
+    })
   })
 })