diff --git a/about.html b/about.html
index d29b848769870565887befd81d06e17c499cb27d..5452d0f91e474b1540c04487b33a50fc4301775a 100644
--- a/about.html
+++ b/about.html
@@ -16,17 +16,17 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
-            <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get">
+            <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
-              <button name="submit" type="submit" id="signup-submit" onClick="_submit_form();">Keep me updated</button>
+              <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
             <!--
-            function _submit_form(){
+            function submitForm(){
                 document.getElementById('signupform').style.display = 'none';
                 document.getElementById('signupconf').style.display = 'block';
-                return true
+                return true;
             }
             //-->
             </script>
@@ -75,17 +75,17 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
-        <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get">
+        <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
-          <button name="submit" type="submit" id="signup-submit2" onClick="_submit_form2();">Keep me updated</button>
+          <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
         </form>
         <div id="signupconf2">Thanks! We'll keep you updated.</div>
         <script language="JavaScript">
         <!--
-        function _submit_form2(){
+        function submitForm2(){
             document.getElementById('signupform2').style.display = 'none';
             document.getElementById('signupconf2').style.display = 'block';
-            return true
+            return true;
         }
         //-->
         </script>
diff --git a/apk.html b/apk.html
index e3e1ef5189ac9a249dcf54df40e05240e2c0095d..7a8a638e3cdbdd381bd12cf5d96be0837fbd3f4a 100644
--- a/apk.html
+++ b/apk.html
@@ -16,17 +16,17 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
-            <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get">
+            <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
-              <button name="submit" type="submit" id="signup-submit" onClick="_submit_form();">Keep me updated</button>
+              <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
             <!--
-            function _submit_form(){
+            function submitForm(){
                 document.getElementById('signupform').style.display = 'none';
                 document.getElementById('signupconf').style.display = 'block';
-                return true
+                return true;
             }
             //-->
             </script>
@@ -79,17 +79,17 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
-        <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get">
+        <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
-          <button name="submit" type="submit" id="signup-submit2" onClick="_submit_form2();">Keep me updated</button>
+          <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
         </form>
         <div id="signupconf2">Thanks! We'll keep you updated.</div>
         <script language="JavaScript">
         <!--
-        function _submit_form2(){
+        function submitForm2(){
             document.getElementById('signupform2').style.display = 'none';
             document.getElementById('signupconf2').style.display = 'block';
-            return true
+            return true;
         }
         //-->
         </script>
diff --git a/building.html b/building.html
index 68694073c9971feb49d31fcfd6446e5ccaf929c3..6c79ff94bc91a4cd0becc4d7b5f0e06f0232a40e 100644
--- a/building.html
+++ b/building.html
@@ -16,17 +16,17 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
-            <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get">
+            <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
-              <button name="submit" type="submit" id="signup-submit" onClick="_submit_form();">Keep me updated</button>
+              <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
             <!--
-            function _submit_form(){
+            function submitForm(){
                 document.getElementById('signupform').style.display = 'none';
                 document.getElementById('signupconf').style.display = 'block';
-                return true
+                return true;
             }
             //-->
             </script>
@@ -105,17 +105,17 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
-        <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get">
+        <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
-          <button name="submit" type="submit" id="signup-submit2" onClick="_submit_form2();">Keep me updated</button>
+          <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
         </form>
         <div id="signupconf2">Thanks! We'll keep you updated.</div>
         <script language="JavaScript">
         <!--
-        function _submit_form2(){
+        function submitForm2(){
             document.getElementById('signupform2').style.display = 'none';
             document.getElementById('signupconf2').style.display = 'block';
-            return true
+            return true;
         }
         //-->
         </script>
diff --git a/copyright.html b/copyright.html
index b8557aca8455d406338308eb9b2a53feddd73356..8387acbe5f7cbc12487c44bfc993dad5ca0f0178 100644
--- a/copyright.html
+++ b/copyright.html
@@ -15,17 +15,17 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
-            <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get">
+            <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
-              <button name="submit" type="submit" id="signup-submit" onClick="_submit_form();">Keep me updated</button>
+              <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
             <!--
-            function _submit_form(){
+            function submitForm(){
                 document.getElementById('signupform').style.display = 'none';
                 document.getElementById('signupconf').style.display = 'block';
-                return true
+                return true;
             }
             //-->
             </script>
@@ -68,17 +68,17 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
-        <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get">
+        <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
-          <button name="submit" type="submit" id="signup-submit2" onClick="_submit_form2();">Keep me updated</button>
+          <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
         </form>
         <div id="signupconf2">Thanks! We'll keep you updated.</div>
         <script language="JavaScript">
         <!--
-        function _submit_form2(){
+        function submitForm2(){
             document.getElementById('signupform2').style.display = 'none';
             document.getElementById('signupconf2').style.display = 'block';
-            return true
+            return true;
         }
         //-->
         </script>
diff --git a/download.html b/download.html
index 142f70e7f7255b3b41b793f795fd48443629c4ea..ea9d7a9b474167c320e040dd2a49d2dae094b15b 100644
--- a/download.html
+++ b/download.html
@@ -16,17 +16,17 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
-            <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get">
+            <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
-              <button name="submit" type="submit" id="signup-submit" onClick="_submit_form();">Keep me updated</button>
+              <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
             <!--
-            function _submit_form(){
+            function submitForm(){
                 document.getElementById('signupform').style.display = 'none';
                 document.getElementById('signupconf').style.display = 'block';
-                return true
+                return true;
             }
             //-->
             </script>
@@ -71,17 +71,17 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
-        <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get">
+        <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
-          <button name="submit" type="submit" id="signup-submit2" onClick="_submit_form2();">Keep me updated</button>
+          <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
         </form>
         <div id="signupconf2">Thanks! We'll keep you updated.</div>
         <script language="JavaScript">
         <!--
-        function _submit_form2(){
+        function submitForm2(){
             document.getElementById('signupform2').style.display = 'none';
             document.getElementById('signupconf2').style.display = 'block';
-            return true
+            return true;
         }
         //-->
         </script>
diff --git a/fdroid.html b/fdroid.html
index 9b6870b78217f5c06b52c0fb8619315fce51e363..958b1eb83957a8c50a193abc260203c1f0fd8e0d 100644
--- a/fdroid.html
+++ b/fdroid.html
@@ -16,17 +16,17 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
-            <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get">
+            <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
-              <button name="submit" type="submit" id="signup-submit" onClick="_submit_form();">Keep me updated</button>
+              <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
             <!--
-            function _submit_form(){
+            function submitForm(){
                 document.getElementById('signupform').style.display = 'none';
                 document.getElementById('signupconf').style.display = 'block';
-                return true
+                return true;
             }
             //-->
             </script>
@@ -75,17 +75,17 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
-        <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get">
+        <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
-          <button name="submit" type="submit" id="signup-submit2" onClick="_submit_form2();">Keep me updated</button>
+          <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
         </form>
         <div id="signupconf2">Thanks! We'll keep you updated.</div>
         <script language="JavaScript">
         <!--
-        function _submit_form2(){
+        function submitForm2(){
             document.getElementById('signupform2').style.display = 'none';
             document.getElementById('signupconf2').style.display = 'block';
-            return true
+            return true;
         }
         //-->
         </script>
diff --git a/get-involved.html b/get-involved.html
index ae1e0b142a361054bcfa460887828393dc602377..f191271dd78f3f8110e1bd457deea3639b905b43 100644
--- a/get-involved.html
+++ b/get-involved.html
@@ -16,17 +16,17 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
-            <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get">
+            <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
-              <button name="submit" type="submit" id="signup-submit" onClick="_submit_form();">Keep me updated</button>
+              <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
             <!--
-            function _submit_form(){
+            function submitForm(){
                 document.getElementById('signupform').style.display = 'none';
                 document.getElementById('signupconf').style.display = 'block';
-                return true
+                return true;
             }
             //-->
             </script>
@@ -65,17 +65,17 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
-        <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get">
+        <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
-          <button name="submit" type="submit" id="signup-submit2" onClick="_submit_form2();">Keep me updated</button>
+          <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
         </form>
         <div id="signupconf2">Thanks! We'll keep you updated.</div>
         <script language="JavaScript">
         <!--
-        function _submit_form2(){
+        function submitForm2(){
             document.getElementById('signupform2').style.display = 'none';
             document.getElementById('signupconf2').style.display = 'block';
-            return true
+            return true;
         }
         //-->
         </script>
diff --git a/hiring.html b/hiring.html
index 7b1f5ad300a6dba2db69cdd768b9dedfd32f1015..4c93402d06d74dffc6cf5ec317cf55c38030d75b 100644
--- a/hiring.html
+++ b/hiring.html
@@ -16,17 +16,17 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
-            <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get">
+            <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
-              <button name="submit" type="submit" id="signup-submit" onClick="_submit_form();">Keep me updated</button>
+              <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
             <!--
-            function _submit_form(){
+            function submitForm(){
                 document.getElementById('signupform').style.display = 'none';
                 document.getElementById('signupconf').style.display = 'block';
-                return true
+                return true;
             }
             //-->
             </script>
@@ -62,17 +62,17 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
-        <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get">
+        <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
-          <button name="submit" type="submit" id="signup-submit2" onClick="_submit_form2();">Keep me updated</button>
+          <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
         </form>
         <div id="signupconf2">Thanks! We'll keep you updated.</div>
         <script language="JavaScript">
         <!--
-        function _submit_form2(){
+        function submitForm2(){
             document.getElementById('signupform2').style.display = 'none';
             document.getElementById('signupconf2').style.display = 'block';
-            return true
+            return true;
         }
         //-->
         </script>
diff --git a/how-it-works.html b/how-it-works.html
index c1ae31c41066f077939a21e7a1fae9bfa943c7bc..c0dc4dbf740029501e8f3e7596700de43610e9a6 100644
--- a/how-it-works.html
+++ b/how-it-works.html
@@ -16,17 +16,17 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
-            <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get">
+            <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
-              <button name="submit" type="submit" id="signup-submit" onClick="_submit_form();">Keep me updated</button>
+              <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
             <!--
-            function _submit_form(){
+            function submitForm(){
                 document.getElementById('signupform').style.display = 'none';
                 document.getElementById('signupconf').style.display = 'block';
-                return true
+                return true;
             }
             //-->
             </script>
@@ -108,17 +108,17 @@ servers to block.</li>
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
-        <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get">
+        <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
-          <button name="submit" type="submit" id="signup-submit2" onClick="_submit_form2();">Keep me updated</button>
+          <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
         </form>
         <div id="signupconf2">Thanks! We'll keep you updated.</div>
         <script language="JavaScript">
         <!--
-        function _submit_form2(){
+        function submitForm2(){
             document.getElementById('signupform2').style.display = 'none';
             document.getElementById('signupconf2').style.display = 'block';
-            return true
+            return true;
         }
         //-->
         </script>
diff --git a/index.html b/index.html
index f8c468841ec4fc5b34970eae941481099becdf19..2f2f5acb43ede321114abba6bed463fd77c52b24 100644
--- a/index.html
+++ b/index.html
@@ -16,22 +16,22 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
-            <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get">
+            <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
-              <button name="submit" type="submit" id="signup-submit" onClick="_submit_form();">Keep me updated</button>
+              <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
             <!--
-            function _submit_form(){
+            function submitForm(){
                 document.getElementById('signupform').style.display = 'none';
                 document.getElementById('signupconf').style.display = 'block';
-                return true
+                return true;
             }
             //-->
             </script>
           </div> <!-- signup -->
-          <label for="menu-toggle"><img src="img/menu.png"></label>
+          <label for="menu-toggle"><img src="img/menu.png"/></label>
           <input type="checkbox" id="menu-toggle"/>
           <ul id="menu">
             <li><a href="index.html" id="indexnav">Home</a></li>
@@ -90,17 +90,17 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
-        <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get">
+        <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
-          <button name="submit" type="submit" id="signup-submit2" onClick="_submit_form2();">Keep me updated</button>
+          <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
         </form>
         <div id="signupconf2">Thanks! We'll keep you updated.</div>
         <script language="JavaScript">
         <!--
-        function _submit_form2(){
+        function submitForm2(){
             document.getElementById('signupform2').style.display = 'none';
             document.getElementById('signupconf2').style.display = 'block';
-            return true
+            return true;
         }
         //-->
         </script>
diff --git a/news/2017-beta-released-security-audit.html b/news/2017-beta-released-security-audit.html
index fb231c18ed469d24ccb086eaf85b310867bbcb9a..100c0e8f3dfebff6f0ccd586dc9a9f6a7499a066 100644
--- a/news/2017-beta-released-security-audit.html
+++ b/news/2017-beta-released-security-audit.html
@@ -15,17 +15,17 @@
         <a href="../index.html"><div id="logo"><img src="../img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
-            <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get">
+            <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
-              <button name="submit" type="submit" id="signup-submit" onClick="_submit_form();">Keep me updated</button>
+              <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
             <!--
-            function _submit_form(){
+            function submitForm(){
                 document.getElementById('signupform').style.display = 'none';
                 document.getElementById('signupconf').style.display = 'block';
-                return true
+                return true;
             }
             //-->
             </script>
@@ -126,17 +126,17 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
-        <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get">
+        <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
-          <button name="submit" type="submit" id="signup-submit2" onClick="_submit_form2();">Keep me updated</button>
+          <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
         </form>
         <div id="signupconf2">Thanks! We'll keep you updated.</div>
         <script language="JavaScript">
         <!--
-        function _submit_form2(){
+        function submitForm2(){
             document.getElementById('signupform2').style.display = 'none';
             document.getElementById('signupconf2').style.display = 'block';
-            return true
+            return true;
         }
         //-->
         </script>
diff --git a/privacy.html b/privacy.html
index 2a5e87f0cc49e79fe6e25301200131fb8414b862..f3ae353d3b608dd5044a9b073671663757dc3104 100644
--- a/privacy.html
+++ b/privacy.html
@@ -16,17 +16,17 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
-            <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get">
+            <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
-              <button name="submit" type="submit" id="signup-submit" onClick="_submit_form();">Keep me updated</button>
+              <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
             <!--
-            function _submit_form(){
+            function submitForm(){
                 document.getElementById('signupform').style.display = 'none';
                 document.getElementById('signupconf').style.display = 'block';
-                return true
+                return true;
             }
             //-->
             </script>
@@ -80,17 +80,17 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
-        <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get">
+        <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
-          <button name="submit" type="submit" id="signup-submit2" onClick="_submit_form2();">Keep me updated</button>
+          <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
         </form>
         <div id="signupconf2">Thanks! We'll keep you updated.</div>
         <script language="JavaScript">
         <!--
-        function _submit_form2(){
+        function submitForm2(){
             document.getElementById('signupform2').style.display = 'none';
             document.getElementById('signupconf2').style.display = 'block';
-            return true
+            return true;
         }
         //-->
         </script>