diff --git a/bugs/index.php b/bugs/index.php
index e5b5da9..3e9dea6 100644
--- a/bugs/index.php
+++ b/bugs/index.php
@@ -38,7 +38,7 @@ function do_submit ()
 	echo '</TD></TR>';
 }
 
-if ($pkg && $version && $severity && $os && $details && $subj) {
+if ($fromaddr && $pkg && $version && $severity && $os && $details && $subj) {
 	$mail = "";
 
 	switch ($pkg) {
@@ -63,6 +63,7 @@ if ($pkg && $version && $severity && $os && $details && $subj) {
 	$mail .= "Package: $pkg\n";
 	$mail .= 'Version: ' . StripSlashes ($version) . "\n";
 	$mail .= "Severity: $severity\n\n";
+	$mail .= "Sender: $fromaddr\n";
 	$mail .= "Operating System: $os\n\n";
 	$mail .= "Detailed Description:\n";
 	$mail .= $details . "\n";
@@ -74,6 +75,7 @@ if ($pkg && $version && $severity && $os && $details && $subj) {
 	echo '<P>Bug report sent!</P>';
 } else {
 	?><P><STRONG>Note:</STRONG> All fields <STRONG>must</STRONG> be filled in.</P><FORM name="bug" method="post"><table><?
+	do_inputline ("Your email", "fromaddr", 12, $fromaddr);
 	do_list ("Package", "pkg", ",QuakeForge,QuakeIIForge,Newtree,QFCC,Forge", $pkg);
 	do_inputline ("Package version", "version", 12, $version);
 	do_list ("Operating System", "os", ",Windows,Linux,FreeBSD,NetBSD,OpenBSD,Other", $os);