diff --git a/browserid/static/dialog/style.css b/browserid/static/dialog/style.css
index f9e18534eae94e73f82490ff4431e7d4cc812f6a..866f565a7e84cb126ca42ac74ec2ee1b2f991891 100644
--- a/browserid/static/dialog/style.css
+++ b/browserid/static/dialog/style.css
@@ -100,17 +100,22 @@ div.actions {
 #identities {
     width: 450px;
     margin: auto;
+    list-style: none;
 }
 
-#identities > div {
-    margin-bottom: .5em;
-    height: 1.4em;
-    font-size: .9em;
+#identities > ul, #identities > ul > li {
+  list-style: none;
 }
 
-#identities > div > * {
-    float: left;
-    cursor: pointer;
+#identities > ul > li {
+  margin-bottom: .5em;
+  height: 1.4em;
+  font-size: .9em;
+  line-height: 18px;
+}
+
+input[type=radio], input[type=radio] + label {
+  cursor: pointer;
 }
 
 button {
diff --git a/browserid/static/dialog/views/signin.ejs b/browserid/static/dialog/views/signin.ejs
index f0802e68da9b72754f49425298400f6fc7a853d7..0fda9e7e17dbe370938da09d634787c02b2efcb3 100644
--- a/browserid/static/dialog/views/signin.ejs
+++ b/browserid/static/dialog/views/signin.ejs
@@ -1,9 +1,11 @@
   <div class="content">
     <p class="prompt">What email address would you like to use to sign into <span class="sitename bad"><%= sitename %></span>?</p>
     <form id="identities" name="identities">
-    <% _.each(identities, function(email_obj, email_address) { %>
-    <div><input type="radio" name="identity" value="<%=email_address%>" /> <%= email_address %></div>
-    <% }); %>
+      <ul>
+        <% _.each(identities, function(email_obj, email_address) { %>
+          <li><input type="radio" name="identity" value="<%=email_address%>" id="<%=email_address%>" /><label for="<%=email_address%>"><%= email_address %></label></li>
+        <% }); %>
+      </ul>
     </form>
   </div>
   <div class="actions">