diff --git a/browserid/static/css/style.css b/browserid/static/css/style.css
index 9944eb2906632e0782d519c3488097c03f9e13f4..09e35763dae0f81c7167cd922978e807dbfff4d1 100644
--- a/browserid/static/css/style.css
+++ b/browserid/static/css/style.css
@@ -93,6 +93,11 @@ header > #manageLink {
     -webkit-border-radius: 0 0 10px 10px;
     -moz-border-radius: 0 0 10px 10px;
     border-radius: 0 0 10px 10px;
+    display: none;
+}
+
+.authenticated header > #manageLink {
+    display: block;
 }
 
 header > #manageLink:hover {
diff --git a/browserid/static/js/browserid.js b/browserid/static/js/browserid.js
index ce321e73ffedd877bc3c1f10bf21b7fe552ec92f..8d88300f4fae1be64d1a535723a65fece865b297 100644
--- a/browserid/static/js/browserid.js
+++ b/browserid/static/js/browserid.js
@@ -43,9 +43,12 @@ $(function() {
 function display_saved_ids()
 {
   var emails = {};
-  BrowserIDIdentities.syncIdentities(function() {
-    emails = getEmails();
-    displayEmails();
+  BrowserIDIdentities.checkAuthenticationAndSync(function(authenticated) {
+    if (authenticated) {
+      $("body").addClass("authenticated");
+      emails = getEmails();
+      displayEmails();
+    }
   });