diff --git a/lib/browserid/views.js b/lib/browserid/views.js
index 9fcb860e2586e208a9058ae8f5a0b1399c395522..53fcf01427448db8ed61dd22d00e6de3f6f796f5 100644
--- a/lib/browserid/views.js
+++ b/lib/browserid/views.js
@@ -139,7 +139,12 @@ exports.setup = function(app) {
 
   app.get("/forgot", function(req, res) {
     // !cachable!  email embedded in DOM
-    res.render('forgot.ejs', {title: 'Forgot Password', fullpage: false, email: req.query.email});
+    res.render('forgot.ejs', {
+      title: 'Forgot Password',
+      fullpage: false,
+      email: req.query.email,
+      enable_development_menu: config.get('enable_development_menu')
+    });
   });
 
   app.get("/signin", function(req, res) {
@@ -160,7 +165,12 @@ exports.setup = function(app) {
 
   app.get("/verify_email_address", function(req, res) {
     // !cachable!  token is embedded in DOM
-    res.render('verify_email_address.ejs', {title: 'Complete Registration', fullpage: true, token: req.query.token});
+    res.render('verify_email_address.ejs', {
+      title: 'Complete Registration',
+      fullpage: true,
+      token: req.query.token,
+      enable_development_menu: config.get('enable_development_menu')
+    });
   });
 
   app.get("/add_email_address", function(req,res) {
diff --git a/resources/views/dialog_layout.ejs b/resources/views/dialog_layout.ejs
index 899bfd401bd3d8aa55382aca6d3562b235079511..4b12722611e3681ead1acbc0eb7e202eff51bad5 100644
--- a/resources/views/dialog_layout.ejs
+++ b/resources/views/dialog_layout.ejs
@@ -20,7 +20,7 @@
 </head>
   <body class="waiting">
       <header id="header">
-         <% if (enable_development_menu) { %>
+         <% if (useJavascript !== false && enable_development_menu) { %>
            <a href="#" id="showDevelopment">&nbsp;</a>
          <% } %>
          <h1><a class="home" target="_blank" href="/">Mozilla Persona Home</a></h1>