diff --git a/admin_index.php b/admin_index.php
index 5b2aef6a..b96eb736 100644
--- a/admin_index.php
+++ b/admin_index.php
@@ -351,10 +351,11 @@ if ($page == 'overview') {
 			$mail_body = "Dear froxlor-team,\n\n";
 			$mail_body .= "the following error has been reported by a user:\n\n";
 			$mail_body .= "-------------------------------------------------------------\n";
-			$mail_body .= $_error['code'].' '.$_error['message']."\n";
-			$mail_body .= $_error['file'].':'.$_error['line']."\n\n";
-			$mail_body .= "Trace:\n".$_error['trace']."\n\n";
-			$mail_body .= "-------------------------------------------------------------\n";
+			$mail_body .= $_error['code'].' '.$_error['message']."\n\n";
+			$mail_body .= "File: ".$_error['file'].':'.$_error['line']."\n\n";
+			$mail_body .= "Trace:\n".trim($_error['trace'])."\n\n";
+			$mail_body .= "-------------------------------------------------------------\n\n";
+			$mail_body .= "Froxlor-version: ".$version."\n\n";
 			$mail_body .= "End of report";
 			$mail_html = str_replace("\n", "<br />", $mail_body);
 
diff --git a/templates/Sparkle/admin/index/send_error_report.tpl b/templates/Sparkle/admin/index/send_error_report.tpl
index 6a5e2cf3..6da355dd 100644
--- a/templates/Sparkle/admin/index/send_error_report.tpl
+++ b/templates/Sparkle/admin/index/send_error_report.tpl
@@ -8,7 +8,7 @@ $header
 		</header>
 
 		<section>
-			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
+			<form method="post" action="{$linker->getLink(array('section' => 'index', 'errorid' => $errid))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 				<input type="hidden" name="s" value="$s" />
 				<input type="hidden" name="page" value="$page" />
@@ -16,10 +16,10 @@ $header
 				<table class="bradius">
 					<thead>
 					<tr>
-						<td>
+						<th>
 							<p>Thank you for reporting this error and helping us to make froxlor better.</p>
 							<p>This is the e-mail that will be sent to the froxlor developer team:</p>
-						</td>
+						</th>
 					</tr>
 					</thead>
 					<tbody>
diff --git a/templates/Sparkle/customer/index/send_error_report.tpl b/templates/Sparkle/customer/index/send_error_report.tpl
index 6a5e2cf3..6da355dd 100644
--- a/templates/Sparkle/customer/index/send_error_report.tpl
+++ b/templates/Sparkle/customer/index/send_error_report.tpl
@@ -8,7 +8,7 @@ $header
 		</header>
 
 		<section>
-			<form method="post" action="{$linker->getLink(array('section' => 'index'))}" enctype="application/x-www-form-urlencoded">
+			<form method="post" action="{$linker->getLink(array('section' => 'index', 'errorid' => $errid))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 				<input type="hidden" name="s" value="$s" />
 				<input type="hidden" name="page" value="$page" />
@@ -16,10 +16,10 @@ $header
 				<table class="bradius">
 					<thead>
 					<tr>
-						<td>
+						<th>
 							<p>Thank you for reporting this error and helping us to make froxlor better.</p>
 							<p>This is the e-mail that will be sent to the froxlor developer team:</p>
-						</td>
+						</th>
 					</tr>
 					</thead>
 					<tbody>