diff --git a/browserid/static/dialog/controllers/authenticate_controller.js b/browserid/static/dialog/controllers/authenticate_controller.js
index 73f0329c912de4ee8eea155dccf2959b83fd586d..0afc27d467f042d04ab7029aeab379569ae9e3f4 100644
--- a/browserid/static/dialog/controllers/authenticate_controller.js
+++ b/browserid/static/dialog/controllers/authenticate_controller.js
@@ -130,7 +130,7 @@
         },
         function onComplete(authenticated) {
           if (authenticated) {
-            self.close("authenticate:authenticated");
+//            self.close("authenticate:authenticated");
           } else {
             //self.find("#cannot_authenticate").hide().fadeIn(400);
           }
diff --git a/browserid/static/dialog/css/popup.css b/browserid/static/dialog/css/popup.css
index 4b145c1267cfb3015473660d3d4a71e84019b467..4ce0fb1e5af9c612dc3f2e9e983c6e6e5171d52d 100644
--- a/browserid/static/dialog/css/popup.css
+++ b/browserid/static/dialog/css/popup.css
@@ -65,6 +65,10 @@ h1 {
     text-shadow: 1px 1px 0 rgba(255, 255, 255,0.5);
 }
 
+h2 {
+    font-size: 1em;
+}
+
 .right {
     text-align: right;
 }
@@ -87,20 +91,20 @@ h1 {
 }
 
 #formWrap {
-    background-color: rgba(255,255,255,1);
+    background-color: rgba(0, 0, 0, 0.035);
+    background-image: url('/i/bg.png');
     position: relative;
     width: 100%;
     height: 250px;
     overflow: hidden;
 }
 
-.setpassword #formWrap {
-    background-color: rgba(0, 0, 0, 0.035);
+.authenticate #formWrap, .authenticated #formWrap {
+    background-color: #fff;
+    background-image: none;
 }
 
-.forgotpassword #formWrap, .setpassword #formWrap {
-    background-color: rgba(0, 0, 0, 0.035);
-    background-image: url('/i/bg.png');
+.forgotpassword #formWrap {
     width: 325px;
     margin: 0 auto;
 }
diff --git a/browserid/static/dialog/views/forgotpassword.ejs b/browserid/static/dialog/views/forgotpassword.ejs
index 230448d961b764653af61d23e54f9750457f6247..20983ee26fd9d3c0a147d448becbfa37494da1c7 100644
--- a/browserid/static/dialog/views/forgotpassword.ejs
+++ b/browserid/static/dialog/views/forgotpassword.ejs
@@ -1,4 +1,4 @@
-    <strong>Reset Password</strong>
+    <h2>Reset Password</h2>
 
     <ul id="inputs">
       <li>
diff --git a/browserid/static/dialog/views/wait.ejs b/browserid/static/dialog/views/wait.ejs
index f50eb0eb7ec305da60b72a7b90674e29a58f4df1..b98a1986c8701e649f2bdac6bf423d02a622c302 100644
--- a/browserid/static/dialog/views/wait.ejs
+++ b/browserid/static/dialog/views/wait.ejs
@@ -1,2 +1,3 @@
   <h2><%= title %></h2>
-  <div class="content"><%= message %></div>
+
+  <p><%= message %></p>