diff --git a/lib/functions/output/function.standard_error.php b/lib/functions/output/function.standard_error.php
index 5d3a8887..59b04ff7 100644
--- a/lib/functions/output/function.standard_error.php
+++ b/lib/functions/output/function.standard_error.php
@@ -38,6 +38,10 @@ function standard_error($errors = '', $replacer = '')
 			$errors
 		);
 	}
+	
+	if (isset($_SERVER['HTTP_REFERER']) && strpos($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST']) !== false) {
+		$link = '<a href="'.$_SERVER['HTTP_REFERER'].'">'.$lng['panel']['back'].'</a>';
+	}
 
 	$error = '';
 	foreach($errors as $single_error)
diff --git a/templates/Classic/misc/error.tpl b/templates/Classic/misc/error.tpl
index a252443c..44b51c6b 100644
--- a/templates/Classic/misc/error.tpl
+++ b/templates/Classic/misc/error.tpl
@@ -7,6 +7,10 @@ $header
 			<td class="field_name_center_noborder"><img src="images/Classic/error.gif" alt="" /></td>
 			<td class="field_name">$error</td>
 		</tr>
+		<tr>
+			<td></td>
+			<td>$link</td>
+		</tr>
 	</table>
 	<br />
 	<br />
diff --git a/templates/Froxlor/misc/error.tpl b/templates/Froxlor/misc/error.tpl
index 038b2d2d..038be0af 100644
--- a/templates/Froxlor/misc/error.tpl
+++ b/templates/Froxlor/misc/error.tpl
@@ -3,6 +3,7 @@ $header
 	<div class="errorcontainer bradius">
 		<div class="errortitle">{$lng['error']['error']}</div>
 		<div class="error">$error</div>
+		$link
 	</div>
 </div>
 $footer