diff --git a/LibreJS.html b/LibreJS.html
deleted file mode 100644
index 4cf55cb..0000000
--- a/LibreJS.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-    <table id="jslicense-labels1">
-        (one <tr> per js file)
-        <tr>
-            <td>link to file</td>
-            <td>link to one or more licenses</td>
-            <td>link to source</td>
-        </tr>
-    </table>
-
--->
-
-<table id="jslicense-labels1">
-    <tr>
-        <td><a href="javascript/freepost.js">freepost.js</a></td>
-        <td><a href="http://www.gnu.org/licenses/agpl-3.0.html">AGPL-3.0</a></td>
-        <td><a href="javascript/freepost.js">freepost.js</a></td>
-    </tr>
-</table>
\ No newline at end of file
diff --git a/database.php b/database.php
index 7961967..3e99aa4 100644
--- a/database.php
+++ b/database.php
@@ -824,10 +824,18 @@ class Database
     {
         $query = $this->database->prepare (
             'UPDATE `user`' .
-            'SET `about` = ?, `email` = ? ' .
-            'WHERE `id` = ?');
-            
-        $query->execute (array ($about, $email, $user_id));
+            'SET `about` = :about, `email` = :email ' .
+            'WHERE `id` = :user_id');
+        
+        $query->bindValue (':about', $about, PDO::PARAM_STR);
+        $query->bindValue (':user_id', $user_id, PDO::PARAM_INT);
+        
+        if (NULL == $email || '' == $email)
+            $query->bindValue (':email', NULL, PDO::PARAM_NULL);
+        else
+            $query->bindValue (':email', $email, PDO::PARAM_STR);
+        
+        $query->execute ();
     }
     
     /**
@@ -1202,9 +1210,6 @@ class Database
             
             $this->database->beginTransaction();
             
-            // Get the user
-            $user = self::get_post ($user_hash_id);
-            
             // Generate a new secret token (used for validation)
             $token = self::get_random_string (32);
             
@@ -1224,7 +1229,7 @@ class Database
                 
             $query->execute (array ($token, $user_hash_id));
             
-            $affected_rows = $query->rowCount();
+            $affected_rows = $query->rowCount ();
             
             $this->database->commit ();
             
@@ -1249,7 +1254,7 @@ class Database
         
         $query = $this->database->prepare (
             'UPDATE `user`' .
-            'SET `password` = SHA2(CONCAT(?, `salt`), 512), `passwordResetToken` = "", `passwordResetTokenExpire` = NULL ' .
+            'SET `password` = SHA2(CONCAT(?, `salt`), 512), `passwordResetToken` = NULL, `passwordResetTokenExpire` = NULL ' .
             'WHERE `passwordResetToken` = ? AND `passwordResetTokenExpire` > NOW()');
             
         $query->execute (array ($new_password, $token));
diff --git a/template/footer.twig b/template/footer.twig
index 8ee79a7..f8f7f99 100644
--- a/template/footer.twig
+++ b/template/footer.twig
@@ -4,7 +4,6 @@
             <div class="footer">
                 <p>
                     Text is available under a <a href="http://creativecommons.org/licenses/by/4.0">Creative Commons Attribution 4.0 International License</a>.
-                    <a href="{{ ''|docroot }}LibreJS.html" data-jslicense="1">JavaScript license information</a>.
                 </p>
                 
                 <ul>
diff --git a/template/login_reset.twig b/template/login_reset.twig
index 3080669..cc42335 100644
--- a/template/login_reset.twig
+++ b/template/login_reset.twig
@@ -2,7 +2,7 @@
 
 <div class="login">
     {% if feedback %}
-        <div class="feedback">
+        <div class="alert bg-danger">
             {{ feedback }}
         </div>
     {% endif %}
@@ -44,7 +44,7 @@
             </div>
 
             <div>
-                <input type="submit" name="reset" class="btn btn-primary" value="Login" />
+                <input type="submit" name="reset" class="btn btn-primary" value="Send reset code" />
             </div>
         </form>