diff --git a/templates/partials/account_form.html b/templates/partials/account_form.html
index 05009594..6374fd5e 100644
--- a/templates/partials/account_form.html
+++ b/templates/partials/account_form.html
@@ -90,7 +90,7 @@
             </label>
 
             <input id="id_email" type="email"
-                   size="30" maxlength="254" name="E" value="{{ email }}">
+                   size="30" maxlength="254" name="E" value="{{ email or '' }}">
             ({% trans %}required{% endtrans %})
         </p>
         <p>
@@ -120,7 +120,7 @@
             </label>
 
             <input id="id_backup_email" type="email" size="30"
-                   maxlength="254" name="BE" value="{{ backup_email }}">
+                   maxlength="254" name="BE" value="{{ backup_email or '' }}">
         </p>
         <p>
             <em>