diff --git a/server/templates/admin.hbs b/server/templates/admin.hbs
index 5111515ecc..3fa7568648 100644
--- a/server/templates/admin.hbs
+++ b/server/templates/admin.hbs
@@ -20,26 +20,26 @@
     });
 </script>
 
-<div class="max-w-screen-lg mx-auto text-main text-white font-extralight p-20">
-        <h1 class="font-display font-extralight mb-10">Admin</h1>
-        <h2 class="text-xl font-bold border-b border-gray-300 mb-4">Users</h1>
+<div class="max-w-screen-lg p-20 mx-auto text-white text-main font-extralight">
+        <h1 class="mb-10 font-display font-extralight">Admin</h1>
+        <h2 class="mb-4 text-xl font-bold border-b border-gray-300">Users</h1>
         <table class="table text-white" id="users">
             <tr>
-                <th class="text-left pr-2">GitHub Login</th>
-                <th class="text-left pr-2">Admin</th>
+                <th class="pr-2 text-left">GitHub Login</th>
+                <th class="pr-2 text-left">Admin</th>
                 <th></th>
             </tr>
             <form action="/users" method="post" class="m-0 mb-4">
                 <tr>
                     <td>
-                        <input name="github_login" type="text" class="border border-gray-300 p-1 mr-2 w-48"
+                        <input name="github_login" type="text" class="w-48 p-1 mr-2 border border-gray-300"
                             placeholder="@github_handle">
                     </td>
                     <td>
                         <input type="checkbox" id="admin" name="admin" value="true">
                     </td>
                     <td class="text-right">
-                        <button class="p-1 w-20 text-white rounded-md bg-gray-600 hover:bg-black">Add</button>
+                        <button class="w-20 p-1 text-white bg-gray-600 rounded-md hover:bg-black">Add</button>
                     </td>
                 </tr>
             </form>
@@ -54,14 +54,14 @@
                         <input action="/users/{{id}}" type="checkbox" {{#if admin}}checked{{/if}}>
                     </td>
                     <td class="text-right">
-                        <button class="p-1 w-20 rounded-md bg-gray-600 hover:bg-black text-white">Remove</button>
+                        <button class="w-20 p-1 text-white bg-gray-600 rounded-md hover:bg-black">Remove</button>
                     </td>
                 </form>
             </tr>
             {{/each}}
         </table>
 
-        <h2 class="text-xl font-bold border-b border-gray-300 mb-4 mt-8">Signups</h1>
+        <h2 class="mt-8 mb-4 text-xl font-bold border-b border-gray-300">Signups</h1>
         <table class="table text-white">
             {{#each signups}}
             <tr>
@@ -69,8 +69,13 @@
                     <td class="align-top">{{github_login}}</td>
                     <td class="pl-4 align-top">{{email_address}}</td>
                     <td class="pl-4 align-top">{{about}}</td>
+                    <td class="pl-4 align-top">
+                         {{#if wants_releases}}releases{{/if}}
+                         {{#if wants_updates}}updates{{/if}}
+                         {{#if wants_community}}community{{/if}}
+                     </td>
                     <td class="text-right">
-                        <button class="p-1 w-20 rounded-md bg-gray-600 hover:bg-black text-white">Remove</button>
+                        <button class="w-20 p-1 text-white bg-gray-600 rounded-md hover:bg-black">Remove</button>
                     </td>
                 </form>
             </tr>
diff --git a/server/templates/community.hbs b/server/templates/community.hbs
index f2a5bc54bd..046d365442 100644
--- a/server/templates/community.hbs
+++ b/server/templates/community.hbs
@@ -1,37 +1,39 @@
 {{#> layout }}
 
-<div class="max-w-screen-lg font-thin mx-auto p-20">
-    <h1 class="font-display font-extralight mb-10">We’re building a community of passionate developers &amp; advocates.</h1>
+<div class="max-w-screen-lg p-20 mx-auto font-thin">
+    <h1 class="mb-10 font-display font-extralight">We’re building a community of passionate developers &amp; advocates.</h1>
     <p class="mt-5 leading-7">Be the first to join a community of builders that want to make the future.</p>
-    <form action="" class="mt-10">
+    <form action="/signups" method="post" class="mt-10">
         <ul>
-            <li class="mt-5 text-lg flex flex-row">
-                <input class="w-8 mr-5" type="checkbox" id="form-releases" name="releases" checked>
+            <li class="flex flex-row mt-5 text-lg">
+                <input class="w-8 mr-5" value=true name="wants_releases" type="checkbox" id="form-releases" checked>
                 <div class="flex-1">
-                    <label for="releases">I want to try Zed when it is available</label>
-                    <p class="text-sm text-gray-400 mt-1 leading-6">Get updates on beta releases, and when Zed launches.</p>
+                    <label for="wants_releases">I want to try Zed when it is available</label>
+                    <p class="mt-1 text-sm leading-6 text-gray-400">Get updates on beta releases, and when Zed launches.</p>
                 </div>
             </li>
-            <li class="mt-5 text-lg flex flex-row">
-                <input class="w-8 mr-5" type="checkbox" id="form-follow" name="follow">
+            <li class="flex flex-row mt-5 text-lg">
+                <input class="w-8 mr-5" value=true name="wants_updates" type="checkbox" id="form-follow">
                 <div class="flex-1">
-                    <label for="follow">I’m interested in following Zed's development</label>
-                    <p class="text-sm text-gray-400 mt-1 leading-6">Receive occasional email updates on the development of Zed and it's tech</p>
+                    <label for="wants_updates">I’m interested in following Zed's development</label>
+                    <p class="mt-1 text-sm leading-6 text-gray-400">Receive occasional email updates on the development of Zed and it's tech</p>
                 </div>
             </li>
-            <li class="mt-5 text-lg flex flex-row">
-                <input class="w-8 mr-5" type="checkbox" id="form-community" name="community">
+            <li class="flex flex-row mt-5 text-lg">
+                <input class="w-8 mr-5" value=true name="wants_community" type="checkbox" id="form-community" name="community">
                 <div class="flex-1">
-                   <label for="community">I want to join the Zed Universe community</label>
-                    <p class="text-sm text-gray-400 mt-1 leading-6">Join the waitlist for our alpha tester community to get early access to releases and contribute to Zed's development through testing &amp; feedback.</p>
+                   <label for="wants_community">I want to join the Zed Universe community</label>
+                    <p class="mt-1 text-sm leading-6 text-gray-400">Join the waitlist for our alpha tester community to get early access to releases and contribute to Zed's development through testing &amp; feedback.</p>
                 </div>
             </li>
         </ul>
-        <input class="block border bg-transparent border-white mt-10 p-5 text-lg w-2/3" type="text" id="form-email" name="email" required minlength="4" placeholder="Your email">
-        <button href="/story" class="block underline mt-10 text-lg">Join the waitlist.</button>
+        <input class="block w-2/3 p-5 mt-10 text-lg bg-transparent border border-white" type="text" id="form-email" name="email_address" required minlength="4" placeholder="Your email">
+        <input class="block w-2/3 p-5 mt-10 text-lg bg-transparent border border-white" type="text" id="form-gh" name="email_address" name="github_login" placeholder="Github Username">
+        
+        <button href="/story" class="block mt-10 text-lg underline">Join the waitlist.</button>
     </form>
 
-    <p class="text-sm text-gray-500 mt-20 leading-7">We'll never spam your email &mdash; You can expect an email every 1 to 3 months from us if you sign up for updates, and occasional emails about public testing releases.</p>
+    <p class="mt-20 text-sm leading-7 text-gray-500">We'll never spam your email &mdash; You can expect an email every 1 to 3 months from us if you sign up for updates, and occasional emails about public testing releases.</p>
 </div>
 
 {{/layout}}