diff --git a/templates/error.twig b/templates/error.twig
index f3fa941b8e0b4761d527d292f2c3d05675d751f4..0db60937391558ced2905d9b1e40ceaeaa670dfa 100644
--- a/templates/error.twig
+++ b/templates/error.twig
@@ -42,7 +42,7 @@
         <form action="{{ errorReportAddress }}" class="pure-form" method="post">
             <p>{{ '{errors:report_text}' | trans }}</p>
             <label for="email">{{ '{errors:report_email}' | trans }}</label>
-                <input type="email" name="email" id="email" class="edge" value="{{ email }}" />
+                <input type="email" name="email" id="email" class="edge" size="50" value="{{ email }}">
 
             <textarea class="text-area edge" name="text" rows="6" cols="50" placeholder="{{ '{errors:report_explain}' | trans }}" required></textarea>
         <p class="center">
diff --git a/www/errorreport.php b/www/errorreport.php
index 633da1bbe2fee4cd77df4230f03a2be095b4e6e7..4af111475ab3a28e0dcdb8fa36e94166e60d1387 100644
--- a/www/errorreport.php
+++ b/www/errorreport.php
@@ -51,7 +51,9 @@ $data['directory'] = dirname(dirname(__FILE__));
 if ($config->getBoolean('errorreporting', true)) {
     $mail = new SimpleSAML\Utils\EMail('SimpleSAMLphp error report from ' . $email);
     $mail->setData($data);
-    $mail->addReplyTo($email);
+    if ($email) {
+        $mail->addReplyTo($email);
+    }
     $mail->setText($text);
     $mail->send();
     SimpleSAML\Logger::error('Report with id ' . $reportId . ' sent');