diff --git a/app/capabilities.js b/app/capabilities.js
index 0faf1fd1..4a686107 100644
--- a/app/capabilities.js
+++ b/app/capabilities.js
@@ -64,6 +64,7 @@ export default async function capabilities() {
   const polyStreams = nativeStreams ? false : polyfillStreams();
 
   return {
+    account: typeof localStorage !== 'undefined',
     crypto,
     streamUpload: nativeStreams || polyStreams,
     streamDownload:
diff --git a/app/templates/signupPromo/index.js b/app/templates/signupPromo/index.js
index 54dde7d8..1b2611ea 100644
--- a/app/templates/signupPromo/index.js
+++ b/app/templates/signupPromo/index.js
@@ -1,7 +1,7 @@
 const html = require('choo/html');
 
 module.exports = function(state) {
-  if (state.user.loggedIn) {
+  if (state.user.loggedIn || !state.capabilities.account) {
     return null;
   }
   return html`
diff --git a/app/templates/userAccount/index.js b/app/templates/userAccount/index.js
index ff7a9490..f852bdec 100644
--- a/app/templates/userAccount/index.js
+++ b/app/templates/userAccount/index.js
@@ -1,10 +1,16 @@
 const html = require('choo/html');
 
 module.exports = function(state, emit) {
+  if (!state.capabilities.account) {
+    return null;
+  }
   const user = state.user;
   const menu = user.loggedIn
     ? html`
-    <ul class="account_dropdown">
+    <ul
+      class="account_dropdown"
+      onblur=${hideMenu}
+      tabindex="-1">
       <li class="account_dropdown__text">
         ${user.email}
       </li>
@@ -15,9 +21,10 @@ module.exports = function(state, emit) {
       </li>
     </ul>`
     : html`
-    <ul class="account_dropdown"
-          tabindex="-1"
-    >
+    <ul
+      class="account_dropdown"
+      onblur=${hideMenu}
+      tabindex="-1">
       <li>
         <a class="account_dropdown__link" onclick=${login}>${state.translate(
         'signInMenuOption'
@@ -55,12 +62,9 @@ module.exports = function(state, emit) {
     emit('logout');
   }
 
-  //the onblur trick makes links unclickable wtf
-  /*
   function hideMenu(event) {
     event.stopPropagation();
     const dropdown = document.querySelector('.account_dropdown');
     dropdown.classList.remove('visible');
   }
-  */
 };
diff --git a/server/state.js b/server/state.js
index 19b0af1b..f050f8be 100644
--- a/server/state.js
+++ b/server/state.js
@@ -7,6 +7,7 @@ module.exports = function(req) {
   const locale = req.language || 'en-US';
   return {
     locale,
+    capabilities: { account: true },
     translate: locales.getTranslator(locale),
     title: 'Firefox Send',
     description:
diff --git a/webpack.config.js b/webpack.config.js
index 754daab2..7d3f7c15 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -157,7 +157,6 @@ const web = {
             }
           },
           'extract-loader',
-          'babel-loader',
           './build/fluent_loader'
         ]
       },